--- cyrus-imapd-2.2-2.2.13.orig/debian/changelog +++ cyrus-imapd-2.2-2.2.13/debian/changelog @@ -0,0 +1,442 @@ +cyrus-imapd-2.2 (2.2.13-9ubuntu1) feisty; urgency=low + + * Merge with Debian unstable; remaining changes: + - Build using DB4.3. + + -- Matthias Klose Thu, 7 Dec 2006 17:31:51 +0100 + +cyrus-imapd-2.2 (2.2.13-9) unstable; urgency=high + + * The "Benjamin made it in time for etch" release. + * High urgency upload with simple fixes for Etch + + [ Henrique de Moraes Holschuh ] + * Prevent cronjobs and initscript from working when another version + of Cyrus IMAPD is installed and 2.2 is in removed but not purged + state (Closes: #393596) + + -- Benjamin Seidenberg Wed, 25 Oct 2006 13:39:08 -0400 + +cyrus-imapd-2.2 (2.2.13-8) unstable; urgency=medium + + [ Sven Mueller ] + * Remove unneeded drac dependency + * New vietnamese translation (thanks to Clytie Siddall, Closes: #383281) + * New russian translation (thanks to Yuri Kozlov, Closes: #383217) + * Updated dutch translation (thanks to Kurt De Bree, Closes: #384870) + * Updated logcheck rules a bit more, thanks to Ross Boylan (Closes: #384265) + * Add spanish debconf translation thanks to César Gómez Martín. + * Add patch to fix FTBFS on GNU/kFreeBSD thanks to Petr Salinger. + (Closes: #388242) + * Run autoconf to generate update configure script after above patch was + applied to configure.in + * Add patch by Ben Poliakoff which fixes an inability to set annotations + from IMAP::Admin perl module (Closes: #389597) + urgency=medium because of this bug. Might have been medium, but the + combination of this bug and the one below seems severe enough for high. + It makes the package unusable to anyone using annotations (guess is 40% + of new installs). + * Update dutch debconf translation (Closes: #389783) + * Fix a problem with repeated builds from the same tree. + * Add upstream patch to imtest.c prefixing raw client responses with C: + + [ Henrique de Moraes Holschuh ] + * Update pt_BR debconf translation + + [ Benjamin Seidenberg ] + * Update date span in debian/copyright + * Fix mistake in init script, ! check_status instead of !check_status. + Thanks to Farzad FARID + * Fix DOS encoding on several files in debian/ (Closes: #391092) + Thanks to Farzad FARID + * Changed my email in debian/control + + -- Benjamin Seidenberg Mon, 16 Oct 2006 19:41:37 -0400 + +cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low + + * The "Bad translations in the middle of the night" release. + * Update czech translation by Martin Šín + (Closes: #382775,#383226) + * Add logcheck ignore line for lmtp delivery log entries (Closes: #382942) + * Update imapd.conf and cyrus.conf to reflect the configurable IDLE patch + applied since 2.2.13-5. (Closes: #382938) + * Update a debconf question so that it doesn't ask in first persion. Fixes a + lintian warning or even two. + * Fix delprune event in cyrus.conf to use cyr_expire (Closes: #383015) + * Add swedish translation by Daniel Nylander + * Fix some mistakes in the german translation, most corrections by Holger + Wansing + * Update italian translation by Cristian Rigamonti + * Correct README.Debian.database regarding number of .seen and .sub + databases. (Closes: #383484) + * Change wording regarding installsieve in README.Debian. (Closes: #383485) + * Add a "WARNING" prefix to the error message about missing sieve scripts. + (Closes: #383640) + * Add a logcheck ignore clause for sieve redirects. (Closes: #384265) + * Fix an implicit pointer conversion in imap/global.c (Closes: #384279) + * Update french translation thanks to Philippe Batailler and the + debian-l10n-french mailing list. (Closes: #384288) + * added 'sieve_allowreferrals' option which controls whether timsieved + issues referrals (default) or proxies (by murch@andrew.cmu.edu) + * update japanese debconf translation, thanks to Hideki Yamane + (henrich@samba.gr.jp) + * Update logcheck rules (thanks to Paul Traina ) + (Closes: #387180) + * Add a patch to change a log message when a user has no sieve file. + + -- Sven Mueller Thu, 14 Sep 2006 18:58:49 +0200 + +cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low + + * Fix a problem in cyrus-common-2.2 preinst + + -- Sven Mueller Thu, 10 Aug 2006 03:58:58 +0200 + +cyrus-imapd-2.2 (2.2.13-5) unstable; urgency=low + + * The "Need to clean the Windows" release + + [ Benjamin Seidenberg ] + * Update the following documentation: + - README.Debian + - README.Debian.database + - README.Debian.postfix + - README.Debian. + (Closes: #378520, #369882) + * Bump debian policy to version 3.7.2 (No changes required) + * Move cyr_expire to /usr/sbin as this is used in cyrus.conf. + Thanks to Alexander Turic . (Closes: #380595) + * Rename cron script to cyrus22 since dots aren't allowed + (Closes: #382069) + + [ Sven Mueller ] + * Remove outdated entry about netnews removal from README.Debian + (Closes: #378519) + * Add --no-create-home to adduser arguments in cyrus-common2.2's + postinst script. (Closes: #378518) + * Modify debian/rules to once again create a meaningful + cyrus-db-types.txt file (Closes: #366957) + * Improve imapd.conf documentation to show how service specific options can + be given. Also update packaged imapd.conf to reflect 2.2 syntax and + behaviour. (Closes: #379881) + * Use ssl-cert and reference system-wide ssl certificates in imapd.conf, + leaving the service specific ssl certs as-is. + * Update imapd.conf documentation to clarify behaviour of allowplaintext in + combination with sasl_mech_list. + * Sync with 2.2 CVS tree from upstream, including a few documentation fixes + and a fix returning empty strings for empty message parts instead of NULL + * Use configurable idle patch from OndÅ~Yej Surý + * Add some more options to /etc/default/cyrus2.2 and use them in the init + script, including a generic OPTIONS variable to allow setting of any + commandline option for cyrmaster. (Closes: #382061) + * Add logic in cyrus-common-2.2 preinst/postrm scripts to rename the + cron.daily script. Supplements change by Benjamin Seidenberg, closing + #382069. + + -- Sven Mueller Thu, 10 Aug 2006 03:17:27 +0200 + +cyrus-imapd-2.2 (2.2.13-4ubuntu1) edgy; urgency=low + + * Synchronize with Debian unstable. + + -- Matthias Klose Tue, 11 Jul 2006 18:51:39 +0200 + +cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low + + [ Benjamin Seidenberg ] + * Switch from dh_movefiles (deprecated) to dh_install + + [ Sven Mueller ] + * Integrate 4 upstream CVS updates/fixes: + - Upstream fix: only free() the backend struct if we allocated it + (don't free cached connections) + - remove limit on the size of mailbox files that can be received by UNDUMP + (write file directly to disk rather than reading the literal into + memory) + - better logging to facilitate message tracking (Wes Craig + ) + - remove redundant check for wildcards in mailbox names (Wes Craig + ) + * Move expiry from ctl_deliver to cyr_expire as suggested by upstreams + upgrade information. + * Add upstream patch to fix a small issue with linking and libRSAglue + * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther + ) + * Add upstream patch to allow reporting of mailbox sizes above 4GB + * Add upstream patch to fix a documentation error in imapoptions + * Add patch to fix some compiler warnings about casts from pointer to + integer of different size + * Change the init script to actuall print some information when called with + the "status" argument + * Add upstream typo fixes of the day. See 0016-upstream-fix-typos for + reference to upstream CVS + + [ Benjamin Seidenberg ] + * Fix typos in UPGRADE.Debian (Closes: #368675) + * Fix link in doc/html/readme.html (Closes: #368676) + * Add upstream patch to fix POP locking when reconstructing + + -- Sven Mueller Wed, 28 Jun 2006 22:21:51 +0200 + +cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high + + [ Sven Mueller ] + * [Security] Add upstream patch to disallow user probes + * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist) + * Add upstream patch to allow ACL removal for invalid IDs + * Add upstream patch to properly handle timezones and DST in fetchnews + * Urgency=high for both security fix and patch to dump/undump bug which + makes package unusuable in many supported setups + + [ Benjamin Seidenberg ] + * Add build dependency on libkvm-dev for kfreebsd (Closes: #366113) + + -- Sven Mueller Fri, 5 May 2006 18:01:41 +0200 + +cyrus-imapd-2.2 (2.2.13-2) unstable; urgency=low + + [ Sven Mueller ] + * Apply fix from upstream CVS to imap/backend.c (Closes: #365629) + + -- Sven Mueller Tue, 2 May 2006 22:14:03 +0200 + +cyrus-imapd-2.2 (2.2.13-1) unstable; urgency=low + + [ Sven Mueller ] + * Switch to new upstream release (2.2.13) + * Fix spelling mistake in debian/control (Closes: #363329) + * Fix logcheck rule (Closes: #364835) + + -- Sven Mueller Sat, 29 Apr 2006 22:31:42 +0200 + +cyrus-imapd-2.2 (2.2.12-5) unstable; urgency=low + + [ Sven Mueller ] + * Add example entries for squatter to cyrus.conf (Closes: #355303) + * Fix URLs in README.sendmail (Closes: #355771) + * Remove STDERR redirection from cyrus-common-2.2 postinst call to adduser + + [ Benjamin Seidenberg ] + * Default to lmtp_downcase_rcpt: yes for compliance with RFC 2821 + (Closes: #357040) + + -- Sven Mueller Fri, 31 Mar 2006 20:11:54 +0200 + +cyrus-imapd-2.2 (2.2.12-4ubuntu1) dapper; urgency=low + + * Synchronize with Debian unstable. + [ Taken from the cyrus21-imapd package ] + * Switch default config to use ssl-cert-snakeoil certificates only for the + global entry. Maintain the other examples to keep more clear how it works. + * Add Depends on ssl-cert. + + -- Matthias Klose Fri, 24 Feb 2006 00:28:45 +0000 + +cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low + + [ Benjamin Seidenberg ] + * Change maintainer to mailing list + * Remove multiple provides: lines in cyrus-nntpd-2.2 (Closes: #352240) + * Add lintian override for CVS dirs in source tarball, we need to hit + upstream with a cluebat for this. + * Move all Build-Depends-Indep dependencies to Build-Depends because of the + way debian/rules invokes this target, they are not installed, fixes FTBFS. + (Closes: #352775, #352779) + + [ Sven Mueller ] + * Disable DRAC authentication + * Fix reference in debian/po/POTFILES.in (Closes: #352948) + + [ Ondřej Surý ] + * Upload to unstable. + + -- Ondřej Surý Wed, 15 Feb 2006 22:42:35 +0100 + +cyrus-imapd-2.2 (2.2.12-3ubuntu1) dapper; urgency=low + + * Build using Berkeley DB 4.3. + + -- Matthias Klose Wed, 15 Feb 2006 17:40:07 +0000 + +cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low + + [ Sven Mueller ] + * Add a script which helps downloading, editing and re-uploading + sieve scripts + * Add a patch to fix db_err callback prototype when building against + Berkeley DB 4.3 or newer + + [ Henrique de Moraes Holschuh ] + * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge, + which would cause data loss when UPGRADE.Debian instructions were + followed. + + [ Benjamin Seidenberg ] + * Changed debian/control so that the doc package is in section doc to match + ftpmaster override. + + [ Ondřej Surý ] + * Updated and renamed logcheck rules. + * Upload to unstable. + + -- Ondřej Surý Mon, 13 Feb 2006 14:16:44 +0100 + +cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low + + [ Henrique de Moraes Holschuh ] + * Modify the Debian default TLS cipher list to use only secure ciphers + suitable for imap/pop/smtp/lmtp TLS, and add an explanation + + [ Benjamin Seidenberg ] + * Rewrote descriptions to all refer to cyrus-common-2.2 + * Changed all package names in all required files within /debian to reflect + the new naming scheme + * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that + this folder is deleted correctly + * Changed policy version to 3.6.2 + * Added upstream patchset 6662: + imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error) + (Closes: #342314) + + [ Sven Mueller ] + * Add a small sed call to debian rules to work around libsnmp[59]-dev + problem which causes an unneccesary "-lsensors" in master/Makefile, + resulting in an unnessary build dependency on libsensors-dev. + Proper fix has to go into netsmp packages, also we need to properly use + Debian's libtool. (Closes: #341580) + * Add czech translation (thanks to Martin Sin and the debian-l10n-czech + team) with a spelling correction from Ondrej Surý. + * Adjust kolab2 annotation patch according to patch from Steffen Joeris + (Closes: #347527) + * Apply patch fixing some error messages in Shell.pm (Closes: #347658) + + [ Ondřej Surý ] + * Upload to experimental. + + -- Ondřej Surý Fri, 13 Jan 2006 11:52:58 +0100 + +cyrus22-imapd (2.2.12-1) experimental; urgency=low + + [ Benjamin Seidenberg ] + * Revised to build against pristine upstream sources. + [ Sven Mueller ] + * Fixed a discrepancy between documentation and actual behaviour of the + "dracinterval" imapd.conf option. Documentation always said the default + would be 0, while the default was actually 5. + [ Henrique de Moraes Holschuh ] + * Change build-dependency from libsnmp4.2-dev (ucd snmp) to libsnmp9-dev | + libsnmp5-dev (netsnmp), so that it works right in sid/etch and sarge + * Upload to experimental + + -- Henrique de Moraes Holschuh Tue, 29 Nov 2005 02:10:21 -0200 + +cyrus22-imapd (2.2.12-0.9) unstable; urgency=low + + [ Sven Mueller ] + * Add patch to be compatible with BerkeleyDB 4.3 + * Add patch to fix TLS/SSL shutdown in timsieved + + -- Sven Mueller Mon, 14 Nov 2005 14:56:20 +0100 + +cyrus22-imapd (2.2.12-0.8) unstable; urgency=low + + [ Sven Mueller ] + * Fix a problem in the init scripts new status check, found by Benjamin + Seidenberg. + + -- Sven Mueller Sun, 13 Nov 2005 20:14:05 +0100 + +cyrus22-imapd (2.2.12-0.7) unstable; urgency=low + + [ Sven Mueller ] + * Switch most deletions of autogenerated files to use debian/deletable.files + * Switch all remaining patches to dpatch so that the .diff.gz should now be + clean except for the files in debian/. + + -- Sven Mueller Thu, 10 Nov 2005 16:06:09 +0100 + +cyrus22-imapd (2.2.12-0.6) unstable; urgency=low + + [ Sven Mueller ] + * Added kolab2 annotation patch as proposed by Christoper Sacca + * Added a small patch to lower the minimum pop3 timeout to 1 minute. + The default is still at 10 minutes. I also added some documentation to make + it clear to admins that it is _not_ recommended to lower the value to less + than 10 minutes (because that is what the standard says it should be at). + I needed this change for use at my workplace though. The patch is disabled + by default. + * Patched init script to support everything LSB 3.0 asks for, including the + "right" return codes, as far as we can. + * Add patch to enhance sieveshell a bit: + - Add --execfile parameter to read commands from a file + - Add --password parameter to pass the users parameter on the commandline + - Add code to return with a non-zero exit code if the last command + executed failed for some reason. + + [ Ondřej Surý ] + * Add 64bit quota dpatch. + * Rerun autoconf and add result as dpatch. + + -- Sven Mueller Fri, 23 Sep 2005 18:55:57 +0200 + +cyrus22-imapd (2.2.12-0.5) unstable; urgency=low + + * Update upgrading information + * Include masssievec in cyrus22-common + * Applied patch from Raphaël 'SurcouF' Bordet to add + nntp support again. + * Eliminate an unused variable from tools/masssievec to get rid of perl + warning. + * Update Recommends and Suggests for cyrus22-common as suggested by HMH + * Move several patches from patching the source directly to patching through + the use of dpatch + + -- Sven Mueller Tue, 24 May 2005 23:13:18 +0200 + +cyrus22-imapd (2.2.12-0.4) unstable; urgency=low + + * Fix usage message in deliver.c to reflect Debian naming of (cyr)deliver, + (cyr)quota and (cyr)reconstruct + * Document the defaultdomain setting a bit better (hopefully) + * fix deletion of debian/cyrus-hardwired-config.txt during cleanup + * build both arch-dependend and arch-independend parts when debian/rules is + called for the build target + * Add Sven Mueller to the list of uploaders + + -- Sven Mueller Fri, 29 Apr 2005 00:14:04 +0200 + +cyrus22-imapd (2.2.12-0.3) unstable; urgency=low + + * Add a README which contains the configure options used to + compile the package. The README is auto-generated by debian/rules + * cyrus22-clients needs to conflict with cyrus21-clients + * cyrus22-common needs to conflict with cyrus21-common + * Add a guess of what the problem might be to the set_cert_stuff failure + message + * Update a few Replaces:, Provides: and Conflicts: lines in debian/control + + -- Sven Mueller Thu, 24 Mar 2005 12:26:27 +0100 + +cyrus22-imapd (2.2.12-0.2) unstable; urgency=low + + * Fix some more perl executable paths + * clean up debian directory a bit + * install sievec with cyrus22-common + * install mbexamine with cyrus22-common + * install smmapd with cyrus22-common + * install cyr_expire with cyrus22-common + * install installsieve with cyrus22-admin + + -- Sven Mueller Tue, 22 Mar 2005 14:48:33 +0100 + +cyrus22-imapd (2.2.12-0.1) unstable; urgency=low + + * Initial revision of cyrus22-imapd package + - debian packaging taken from cyrus21-imapd_2.1.18-1 + * Add/fix imapd.conf info regarding virtual domains + * Add DRAC support (i.e. apply DRAC patch from /contrib) + * Add syncldap2cyrus.pl script from #260833 (a cyrus21 bug) + + -- Sven Mueller Fri, 18 Mar 2005 13:34:09 +0100 + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.docs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.docs @@ -0,0 +1,2 @@ +debian/UPGRADE.Debian +debian/README.* --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.dirs @@ -0,0 +1,2 @@ +usr/include/cyrus +usr/lib --- cyrus-imapd-2.2-2.2.13.orig/debian/control +++ cyrus-imapd-2.2-2.2.13/debian/control @@ -0,0 +1,179 @@ +Source: cyrus-imapd-2.2 +Section: mail +Priority: extra +Maintainer: Debian Cyrus Team +Uploaders: Henrique de Moraes Holschuh , Sven Mueller , Benjamin Seidenberg , Ondřej Surý +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] + +Package: cyrus-common-2.2 +Architecture: any +Section: mail +Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} +Recommends: cyrus-imapd-2.2 | cyrus-pop3d-2.2 | cyrus-murder-2.2 | cyrus-nntpd-2.2 | cyrus-admin-2.2 +Suggests: cyrus-clients-2.2, cyrus-admin-2.2, cyrus-imapd-2.2, cyrus-pop3d-2.2, cyrus-murder-2.2, cyrus-nntpd-2.2, cyrus-doc-2.2, sasl2-bin, apt-listchanges (>= 2.35) +Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common, cyrus22-common +Replaces: cyrus21-common, cyrus22-common +Provides: cyrus21-common, cyrus22-common +Description: Cyrus mail system (common files) + Cyrus is a fully-featured IMAP daemon, with a number of features not + found in other IMAP implementations, including: + o Designed to handle massive quantities of mail + o No need for users to have login accounts + o Virtual domain support + o Support for POP3 in addition to IMAP + o Sieve server-side email filtering + o Servers don't run as root + o Easy support for mail quotas + o SSL support, including secure IMAP + o DRAC support for pop/imap-before-smtp + o IPv6 support + o NNTP support + For more information, see http://asg.web.cmu.edu/cyrus/. + . + Note: Cyrus doesn't support reading from and storing mail in your + standard mail spool - it stores mail in a separate directory in its + own MH-like format. + . + This package contains the common files needed by the other Cyrus + components. The cyrus22-imapd and/or cyrus22-pop3d packages are needed + to enable IMAP and POP3 support respectively. cyrus22-murder can be + used to enable IMAP, POP3 and LMTP proxying. + . + Homepage: http://cyrusimap.web.cmu.edu/ + +Package: cyrus-doc-2.2 +Architecture: all +Section: doc +Provides: cyrus21-doc, cyrus22-doc +Replaces: cyrus21-doc, cyrus22-doc +Conflicts: cyrus21-doc, cyrus22-doc +Description: Cyrus mail system (documentation files) + This package contains the documentation for the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-imapd-2.2 +Architecture: any +Section: mail +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Provides: imap-server, cyrus21-imapd, cyrus22-imapd +Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd +Replaces: cyrus21-imapd, cyrus22-imapd +Description: Cyrus mail system (IMAP support) + This package contains the IMAP (Internet Mail Access Protocol) portion + of the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: cyrus-pop3d-2.2 +Architecture: any +Section: mail +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server +Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server +Replaces: cyrus21-pop3d, cyrus22-pop3d +Description: Cyrus mail system (POP3 support) + This package contains the POP3 (Post Office Protocol) portion of the Cyrus + IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-admin-2.2 +Architecture: all +Section: mail +Depends: libcyrus-imap-perl22 (>= ${Source-Version}) +Suggests: sasl2-bin +Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin +Replaces: cyrus21-admin, cyrus22-admin +Provides: cyrus21-admin, cyrus22-admin +Description: Cyrus mail system (administration tools) + This package provides the administrative tools for the Cyrus IMAPd suite. + It contains the cyradm tool which can be used to administer + both local and remote Cyrus mail systems. It also contains sieveshell + and its deprecated cousin installsieve, which can be used to manage + sieve scripts. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-murder-2.2 +Section: mail +Architecture: any +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Recommends: cyrus-imapd-2.2 (= ${Source-Version}), cyrus-pop3d-2.2 (= ${Source-Version}) +Conflicts: cyrus21-murder, cyrus22-murder +Replaces: cyrus21-murder, cyrus22-murder +Provides: cyrus21-murder, cyrus22-murder +Description: Cyrus mail system (proxies and aggregator) + This package contains the Cyrus IMAPd suite murder aggregator system, + i.e. IMAP, POP3 and LMTP proxies, and the mupdate mailbox master daemon. + It allows for cluster setups where there are many backend Cyrus spools and + frontend proxy servers. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: cyrus-nntpd-2.2 +Architecture: any +Section: mail +Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends} +Conflicts: news-transport-system +Replaces: cyrus21-nntpd, cyrus22-nntpd +Provides: news-transport-system, cyrus21-nntpd, cyrus22-nntpd +Description: Cyrus mail system (NNTP support) + This package contains the NNTP (Network News Transfer Protocol) portion of + the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + +Package: cyrus-clients-2.2 +Architecture: any +Section: mail +Depends: ${shlibs:Depends} +Conflicts: cyrus21-clients, cyrus22-clients +Provides: cyrus21-clients, cyrus22-clients +Replaces: cyrus21-clients, cyrus22-clients +Description: Cyrus mail system (test clients) + This package contains client tools to test the Cyrus IMAPd suite. + It contains the mupdatetest, sivtest, smtptest, lmtptest, + imtest and pop3test tools which can be used to interactively talk to + a mupdate, sieve, smtp, lmtp, imap or pop3 server. + The clients are fully SASL-enabled for authentication. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: cyrus-dev-2.2 +Architecture: any +Section: devel +Depends: libcyrus-imap-perl22 (>= ${Source-Version}), cyrus-common-2.2 (= ${Source-Version}), libsasl2-dev (>= 2.1.9) +Conflicts: cyrus-dev, cyrus21-dev, cyrus22-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52) +Replaces: cyrus21-dev, cyrus22-dev +Provides: cyrus21-dev, cyrus22-dev +Description: Cyrus mail system (developer files) + This package contains header files and the static library needed + to develop IMAP applications that interface with the Cyrus IMAPd suite. + . + For more information, please see the cyrus-common-2.2 package. + + +Package: libcyrus-imap-perl22 +Architecture: any +Depends: ${perl:Depends}, ${shlibs:Depends} +Provides: libcyrus-imap-perl, libcyrus-imap-perl21 +Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21 +Replaces: libcyrus-imap-perl21 +Section: perl +Description: Interface to Cyrus imap client imclient library + The Cyrus::IMAP module provides an interface to the Cyrus imclient + library. These are primarily useful for implementing cyradm operations + within a Perl script; there are easier ways to implement general client + operations, although they may be more limited in terms of authentication + options when talking to a Cyrus imapd. + . + The modules that compose Cyrus::SIEVE are also included, but they are + undocumented upstream. + . + For more information, please see the cyrus-common-2.2 package. + --- cyrus-imapd-2.2-2.2.13.orig/debian/rules +++ cyrus-imapd-2.2-2.2.13/debian/rules @@ -0,0 +1,393 @@ +#!/usr/bin/make -f +# debian/rules for CMU Cyrus IMAP version 2.2 +# GNU copyright 1997 by Joey Hess. +# Copyright (c) 2001 by Henrique de Moraes Holschuh +# Published under the GNU GPL license +# Based on previous work by Michael-John Turner , +# David Parker +# + +# DebHelper control +export DH_ALWAYS_EXCLUDE=CVS + +export MAINPKG=cyrus-common-2.2 +export DOCPKG=cyrus-doc-2.2 +export TMPPKG := $(CURDIR)/debian/tmp +export PKGDIR := $(CURDIR)/debian/$(MAINPKG) +export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG) + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# enable dpatch usage +#include /usr/share/dpatch/dpatch.make +# -*- Makefile -*-, you silly Emacs! +# vim: set ft=make: + +DPATCH_PACKAGE ?= ${DEB_SOURCE_PACKAGE} +DPATCH_PACKAGE ?= ${PACKAGE} +DPATCH_STAMPDIR ?= debian/patched +DPATCH_STAMPFN ?= patch-stamp + +ifdef PATCHLIST +UNPATCHLIST := ${PATCHLIST} +DPATCH_ALL := +else +DPATCH_ALL := -all +endif + +ifneq (${DPATCH_STAMPDIR},debian/patched) +_STAMPDIR := --stampdir=${DPATCH_STAMPDIR} +endif + +ifdef DPATCH_WORKDIR +_WORKDIR := --workdir ${DPATCH_WORKDIR} +endif + +patch: ${DPATCH_STAMPFN} +${DPATCH_STAMPFN}: + test -d ${DPATCH_STAMPDIR} || install -d ${DPATCH_STAMPDIR} + @echo "Patches applied in the Debian version of ${DPATCH_PACKAGE}:" > $@T + @echo >> $@T + dpatch ${_WORKDIR} apply${DPATCH_ALL} -v ${_STAMPDIR} ${PATCHLIST} + dpatch ${_WORKDIR} cat${DPATCH_ALL} ${PATCHLIST} >>$@T + mv -f $@T $@ + +unpatch: + dpatch ${_WORKDIR} deapply${DPATCH_ALL} ${_STAMPDIR} ${UNPATCHLIST} + rm -rf ${DPATCH_STAMPFN} ${DPATCH_STAMPFN}T ${DPATCH_STAMPDIR} + +# arch-tag: 6bb4c625-9a85-41d9-ab37-23cb0a16fb39 +#END_dpatch.make + +# Extra version information to add to Cyrus IMAPd ID +DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p') +EXTRA_IDENT:="Debian-$(DEBVERSION)" + +# DB engine version +DBENGINE=BerkeleyDB4.3 + +DEBUGFLAGS=-g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS += -O0 +else + DEBUGFLAGS += -O2 +endif + +# FOR AUTOCONF 2.52 AND NEWER ONLY +CONFFLAGS = +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +# Other oddities +ifneq (,$(findstring strict,$(DEB_BUILD_OPTIONS))) + CONFFLAGS += --enable-warnings-are-errors +endif + +# The clean target will remove any and all cruft (as defined by +# configure ; make distclean ; cd intl; make distclean ). +# This is done to make sure the build daemon's source tree is the +# same as the one I am using to produce the i386 debs. +clean: clean-patched unpatch +clean-patched: configure + dh_testdir + dh_testroot + -xargs -t -r chmod +x < debian/executable.files + -rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp + -$(MAKE) -i distclean + -rm -f config.h config.cache config.status config.log stamp-config confdefs.h + -rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile + -rm -f doc/pod2htm* + -rm -f master/makedepend.log + -rm -rf doc/man + -rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt debian/README.configure-options + # -rm -rf et/ + rm -rf autom4te.cache + -xargs -t -r rm -f < debian/deletable.files + dh_clean + +configure: + # ./autogen.sh + +build: build-arch build-indep + +configure-stamp: patch + dh_testdir + # -rm -f config.sub config.guess + # cp /usr/share/misc/config.sub config.sub + # cp /usr/share/misc/config.guess config.guess + touch configure.in && touch aclocal.m4 && touch configure + + # IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE + # DBENGINE AT THE TOP OF THIS MAKEFILE! + ./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \ + --with-extraident=$(EXTRA_IDENT) \ + --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \ + --bindir=/usr/sbin --sbindir=/usr/sbin \ + --includedir=/usr/include/cyrus \ + --datadir=/usr/share/cyrus --sysconfdir=/etc \ + --with-statedir=/var/state \ + --sharedstatedir=/usr/share/cyrus \ + --localstatedir=/var/lib/cyrus \ + --mandir=/usr/share/man \ + --with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \ + --with-perl=/usr/bin/perl \ + --with-openssl=/usr --with-auth=unix \ + --enable-murder --enable-nntp \ + --disable-listext --enable-annotatemore --with-sasl=/usr \ + --with-drac=/usr \ + --with-cyrus-user=cyrus --with-cyrus-group=mail \ + --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \ + --with-pidfile=/var/run/cyrmaster.pid \ + --with-syslogfacility=MAIL \ + --with-seen-db=skiplist --with-mboxlist-db=skiplist \ + --with-ucdsnmp=/usr + echo 'To build this package, configure was called as follows:' \ + > debian/README.configure-options + grep with\ options config.status \ + | sed -e 's/^.*options \\"/configure /;s/\\"$///' \ + >> debian/README.configure-options + sed -i 's/ -lsensors//' master/Makefile + touch configure-stamp + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + dh_testdir + + PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE) + # store database configuration for possible automatic + # upgrading later + echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt + grep _db lib/imapoptions \ + | cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$$//' \ + | sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\ + | awk '{printf("%s %s\n",toupper($$1),$$2);}' \ + >>debian/cyrus-db-types.txt + mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \ + && sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \ + && rm debian/cyrus-db-types.txt.old + + # store some useful state about the current package + echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt + if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \ + echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\ + else \ + echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\ + fi + + touch build-arch-stamp + +# We aren't actually able to build arch-indep independently from +# arch-dep, so we guarantee that the arch build has been done first +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp build-arch + dh_testdir + + cd doc &&\ + pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\ + fig2dev -L png murder.fig murder.png &&\ + rm -f groff-html-*.png pod2htm* + cd doc &&\ + mkdir -p man &&\ + for man in ../man/*.[1-9] ../debian/*.[1-9]; do \ + echo "Generating html manpage for $$man..."; \ + groff -man -Thtml $$man > man/`basename $$man`.html; \ + done + pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html + rm -f pod2htm* + + touch build-indep-stamp + +install-arch: build-arch + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + + $(MAKE) install DESTDIR=$(TMPPKG) + + # fix totaly broken location of the include files; + # while at it, also avoid namespace colision, and move + # lots of admin-only/system-only stuff to sbin and lib + # also, do the renaming needed for alternatives + # and fix the weird side-effect of setting the proper cyrus + # location in configure. + mkdir -p $(TMPPKG)/usr/sbin + mkdir -p $(TMPPKG)/usr/lib/cyrus + for i in master reconstruct quota deliver ; do \ + mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\ + done + for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \ + tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \ + cyr_expire; do \ + mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\ + done + mkdir -p $(TMPPKG)/usr/include + mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include + #mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin + + # Move the perl crap to a saner place + mkdir -p $(TMPPKG)/usr/lib + mkdir -p $(TMPPKG)/usr/share/perl5 + #mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus + #mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib + + # for stuff in /etc + mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d + install -m 644 debian/imapd.conf $(TMPPKG)/etc + install -m 644 debian/cyrus.conf $(TMPPKG)/etc + (cd debian ; for i in *.pam ;\ + do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\ + done) + + # We rename some utils, so we need to sort out the manpages + for i in master reconstruct quota deliver ; do \ + mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \ + done + + # And add our own manpages + mkdir -p $(TMPPKG)/usr/share/man/man8 + install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8 + install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8 + install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8 + + # SNMP files + mkdir -p $(TMPPKG)/usr/share/snmp/mibs + install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt + + # Install cyradm icons + mkdir -p $(TMPPKG)/usr/share/icons/mini + install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm + install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm + + # Install debian-provided scripts + install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs + install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb + + # and logcheck files + install -m 644 debian/logcheck.ignore \ + $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2_2 + install -m 644 debian/logcheck.violations.ignore \ + $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2_2 + + # Install the stuff needed for upgrades + for i in convert-sieve.pl dohash rehash undohash translatesieve \ + upgradesieve masssievec; do \ + install -m 755 tools/$$i $(PKGDIR)/usr/lib/cyrus/upgrade ;\ + done + install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade + # And other upgrade helpers + install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \ + $(PKGDIR)/usr/lib/cyrus + # And other misc useful tools + install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort + + # Install imtest and its symlinks + mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.2/usr/bin + for i in $(TMPPKG)/usr/bin/*test ; do \ + rm -f "$$i" || true ;\ + (cd $(CURDIR)/debian/cyrus-clients-2.2/usr/bin &&\ + ln -s imtest `basename $$i`) ;\ + done + + # Lintian and Linda overrides + cd debian ; \ + for i in *.linda ; do \ + mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\ + install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\ + done ;\ + for i in *.lintian ; do \ + mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\ + install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\ + done + + dh_install -a --sourcedir=$(TMPPKG) + touch install-arch-stamp + +# We aren't actually able to install arch-indep independently from +# arch-dep, so we guarantee that the arch build has been done first +install-indep: build-indep install-arch + dh_testdir + dh_testroot + #dh_clean -k + dh_installdirs -i + + # Massage the documentation into place + #mkdir -p $(DOCDIR) + #find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \; + #-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c) + #find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \; + + # Install the html docs and examples + mkdir -p $(DOCDIR)/html + install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html + cp -a doc/man $(DOCDIR)/html + cp -a debian/examples $(DOCDIR) + install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples + + # Install contrib/ files + mkdir -p $(DOCDIR)/contrib + xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib + + dh_install -i --sourcedir=$(TMPPKG) + +binary-indep: install-indep + dh_testdir -i + dh_testroot -i +# dh_installdebconf -i + dh_installdocs -p cyrus-admin-2.2 -p cyrus-doc-2.2 + dh_installexamples -p cyrus-admin-2.2 + dh_installmenu -i +# dh_installlogrotate -i +# dh_installpam -i +# dh_installmime -i +# dh_installcron -i + dh_installman -i + dh_installchangelogs -p cyrus-admin-2.2 doc/changes.html + dh_installchangelogs -p cyrus-doc-2.2 + dh_strip -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_makeshlibs -i + dh_installdeb -i + dh_perl -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install-arch + dh_testdir -a + dh_testroot -a + dh_installdebconf -a + dh_installdocs -p $(MAINPKG) -p cyrus-clients-2.2 -p libcyrus-imap-perl22 + dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus-clients-2.2 + dh_installmenu -a +# dh_installlogrotate -a +# dh_installpam -a +# dh_installmime -a + dh_installinit -p $(MAINPKG) --noscripts --name=cyrus2.2 + dh_installcron -a --name=cyrus22 + dh_installman -a +# dh_installinfo -a + dh_installchangelogs -p $(MAINPKG) -p cyrus-clients-2.2 doc/changes.html + dh_installchangelogs -p libcyrus-imap-perl22 perl/imap/Changes + dh_fixperms -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a + dh_perl -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep clean-patched --- cyrus-imapd-2.2-2.2.13.orig/debian/logcheck.ignore +++ cyrus-imapd-2.2-2.2.13/debian/logcheck.ignore @@ -0,0 +1,64 @@ + +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: recovered +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: checkpointed +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: pruning +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: purged +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: executed +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: accepted connection +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: telling master +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete: +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: (bad)?login: +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: starttls: [[:alnum:]]+ with cipher +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: (\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed: +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: DIGEST-MD5 server step +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: (done +)?recovering cyrus databases +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: archiving +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: checkpointing +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: done checkpointing +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_deliver\[[0-9]+\]: duplicate_prune: pruning back +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_deliver\[[0-9]+\]: duplicate_prune: purged +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/tls_prune\[[0-9]+\]: (tls_prune: )?purged +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: ready for work +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: about to exec +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: process started +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: process [0-9]+ exited, status 0$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: service [a-zA-Z0-9]+ now has [0-9]+ workers +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: pop3s failed: +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: lmtp connection preauth'd as postman +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: dupelim: eliminated duplicate message to +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_check: +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_mark: +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: committing txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: starting txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: sieve parse error +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: sieve: discarded +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: abort_txn: aborting txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: delete: starting txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: open: user .* opened +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mycommit: committing txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: myfetch: reusing txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: myfetch: starting txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: reusing txn +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: seen_db: user .* opened +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: Connection reset by peer, closing connection +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: SQUAT failed +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: SQUAT returned [0-9]+ messages +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: idle for too long, closing connection +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: annotatemore_store +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: created stage directory +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: imaps TLS negotiation failed +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: synchronizing mailbox +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mailbox list synchronization +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: unready for connections +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: ]+>? +to mailbox: .*$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: sieve redirected: ]+>? +to: [._[:alnum:]-]+@[._[:alnum:]-]+$ + --- cyrus-imapd-2.2-2.2.13.orig/debian/README.exim +++ cyrus-imapd-2.2-2.2.13/debian/README.exim @@ -0,0 +1,66 @@ +Setting up Cyrus IMAPd for Exim +$Id: README.exim 681 2006-10-25 17:42:18Z astronut $ +=========================================================== + +This is very incomplete information, if you are an exim user, please send +in a more complete document. + + +General configuration hints (configuration examples assume you are using +the Debian Exim4 configuration scheme and paths are relative to +/etc/exim4): + +1. Use Exim version 4. Exim version 3 just doesn't cut it in the lmtp + area, which is very important for performance when dealing with Cyrus + IMAPd. + +2. Use the LMTP transport to deliver using a unix socket (fastest), or + the SMTP transport in LMTP mode to deliver over a TCP/IP socket. + + For local delivery over a unix socket, add a file into conf.d/transports + with the following: + + cyrus_delivery: + driver = lmtp + socket = /var/run/cyrus/socket/lmtp + batch_max = 20 + user = mail + + (set batch_max to whatever is best for your setup, and make sure you + allow enough Cyrus lmtp processes to serve that many lmtp connections) + + If that doesn't work, I suggest you create a group for lmtp delivery, + add whichever user exim is running as to it, and use dpkg-statoverride + to make /var/run/cyrus/socket/lmtp writeable by that group. + + To then deliver to Cyrus, you will need to comment check_local_user in + conf.d/router/900_exim4-config_local_user, and change the LOCAL_DELIVERY + macro in conf.d/main/01_exim4-config_listmacrosdefs to + LOCAL_DELIVERY=cyrus_delivery. + + If you still want to deliver some messages to a mail spool then create + conf.d/router/899_exim4-config_copy_to_mbox and put this in it, changing + the local_parts as necessary: + + copy_to_mbox: + debug_print = "R: copy_to_mbox for $local_part@$domain" + driver = accept + unseen + local_parts = postmaster + transport = mail_spool + + This will deliver postmaster mail to both cyrus and + /var/mail/postmaster. You can comment the unseen option to have it only + deliver once to the mail_spool. If you don't set check_local_user or + the user option the spool files will be owned by mail. + +3. Kill any NULs (ASCII 0x00) inside the message, if you don't want Cyrus + to bounce such malformed crap. Calling "tr -d '\000'" as a filter might + do the trick. + +4. Sieve often needs to set -f option on /usr/sbin/sendmail when doing + redirects. Exim allows only trusted_users to do this. It is recommended + that you make sure "cyrus" is in the list of trusted_users in + conf.d/main/02_exim4-config_options: + trusted_users = uucp:cyrus + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.init +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init @@ -0,0 +1,248 @@ +#! /bin/sh +# +### BEGIN INIT INFO +# Provides: cyrus-common-2.2 +# Required-Start: $syslog $network +# Required-Stop: $syslog $network +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: common init system for cyrus 2.2 IMAP/POP3 daemons. +# Description: common init system the for cyrus 2.2 IMAP/POP3 daemons. +# starts the central cyrus 2.2 master process, which can +# then start various services depending on configuration. +# Typically starts IMAP and POP3 daemons, but might also +# start an NNTP daemon and various helper daemons for +# distributed mail/news storage systems (high-performance +# and/or high-reliability setups). +### END INIT INFO +# +# Copyright 2001-2005 by Henrique de Moraes Holschuh +# Various modifications done by Sven Mueller +# Distributed under the GPL version 2 +# +# $Id: cyrus-common-2.2.cyrus2.2.init 681 2006-10-25 17:42:18Z astronut $ + +# Make sure we get sane results on borked locales +LC_ALL=C +export LC_ALL + +# Overridable defaults +unset CYRUS_VERBOSE +unset LISTENQUEUE +unset CONF +unset MASTERCONF +[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2 + +[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE +# Make sure the master process is daemonized +OPTIONS="${OPTIONS} -d" +[ "x${CONF}" != "x" ] && OPTIONS="-C ${CONF} ${OPTIONS}" +[ "x${MASTERCONF}" != "x" ] && OPTIONS="-M ${MASTERCONF} ${OPTIONS}" +[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}" + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DAEMON=/usr/sbin/cyrmaster +NAME=cyrmaster +[ "x${PIDFILE}" = "x" ] && PIDFILE="/var/run/${NAME}.pid" +DESC="Cyrus IMAPd" + +#Check if Cyrus 2.2 is installed +test -x ${DAEMON} || exit 0 +grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \ + /usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0 + +set -e + +START="--start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}" + +verifydb() { + while read -r DBKEY DBVALUE ; do + match=`sort -u < $1 | gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }"` + [ "x${match}" != "x${DBVALUE}" ] && return 0 + done + return 1 +} + +createdir() { +# $1 = user +# $2 = group +# $3 = permissions (octal) +# $4 = path to directory + [ -d "$4" ] || mkdir -p "$4" + chown -c -h "$1:$2" "$4" + chmod -c "$3" "$4" +} + +missingstatoverride () { + echo "$0: You are missing a dpkg-statoverride on $1. Add it." >&2 + exit 1 +} + +fixdirs () { + dir=`dpkg-statoverride --list /var/run/cyrus` \ + || missingstatoverride /var/run/cyrus + [ -z "$dir" ] \ + || createdir $dir + dir=`dpkg-statoverride --list /var/run/cyrus/socket` \ + || missingstatoverride /var/run/cyrus/socket + [ -z "$dir" ] \ + || createdir $dir +} + +check_status () { + if [ "$1" = "verbose" ]; then + PRINTIT=echo + else + PRINTIT=true + fi + if [ ! -f ${PIDFILE} ]; then + # using [c] in the grep avoids catching the grep + # process itself + if ps auxww | grep -qE 'usr/sbin/[c]yrmaster' ; then + # Damn, PID file doesn't exist, but cyrmaster process + # exists. Though strictly speaking, we should not + # do this, reconstruct the PID file here. + pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \ + && pidof /usr/sbin/cyrmaster > ${PIDFILE} + ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`" + return 0 + fi + fi + if [ -s ${PIDFILE} ] && kill -0 `cat ${PIDFILE}` > /dev/null 2>&1; then + ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`" + return 0 + else + # the PID file might simply not match the cyrmaster process. + if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then + # go ahead and fix it + pidof /usr/sbin/cyrmaster > ${PIDFILE} + ${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`" + return 0 + else + # no process and/or no PID file, return failure + ${PRINTIT} "cyrmaster not running with" + return 1 + fi + fi + # this point should never be reached, return unknown status if it + # is anyway + return 4 +} + +case "$1" in + start) + # Verify if there are old Cyrus 1.5 spools that were not upgraded + [ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \ + -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && { + echo "$0: It appears that you still have an version 1.5 spool" 1>&2 + echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2 + echo "$0: at /usr/share/doc/cyrus-common-2.2/UPGRADE.Debian" 1>&2 + echo + echo "$0: Cyrmaster not started." + exit 6 + } + # Verify consistency of database backends + [ -f /usr/lib/cyrus/cyrus-db-types.active ] && { + # is it safe to start cyrmaster? compare "key value" pairs + # from the (old) active database types file with the new one + ( sort -u /usr/lib/cyrus/cyrus-db-types.active \ + | grep DBENGINE \ + | verifydb /usr/lib/cyrus/cyrus-db-types.txt \ + ) && { + echo "$0: Database backends mismatch! You must manually" 1>&2 + echo "$0: verify and update the Cyrus databases to the" 1>&2 + echo "$0: new backends." 1>&2 + echo "$0: Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian" 1>&2 + echo "$0: for instructions." 1>&2 + echo + echo "$0: Cyrmaster not started." + exit 6 + } + } + echo -n "Starting ${DESC}: " + fixdirs + if check_status ; then + echo "${DAEMON} already running." + exit 0 + fi + if start-stop-daemon ${START} >/dev/null 2>&1 ; then + echo "$NAME." + else + if ! check_status ; then + echo "(failed)." + exit 1 + fi + fi + ;; + stop) + echo -n "Stopping $DESC: " + if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then + echo "$NAME." + rm -f ${PIDFILE} + exit 0 + else + # process running? + if check_status; then + # Yes, report failure. + echo "(failed)." + exit 1 + else + # No, return as if stopped a running process + # successfully. + echo "." + rm -f ${PIDFILE} + exit 0 + fi + fi + ;; + reload|force-reload) + echo "Reloading $DESC configuration files." + if start-stop-daemon --stop --signal 1 --quiet \ + --name ${NAME} --pidfile /var/run/$NAME.pid >/dev/null 2>&1 ; then + exit 0 + else + exit 1 + fi + ;; + restart) + $0 stop && { + echo -n "Waiting for complete shutdown..." + i=5 + while [ $i -gt 0 ] ; do + # exit look when server is not running + check_status || break + sleep 2s + i=$(($i - 1)) + echo -n "." + done + [ $i -eq 0 ] && { + echo + echo "fatal: incomplete shutdown detected, aborting." + exit 1 + } + echo + } + exec $0 start + ;; + status) + check_status verbose + exit $? + ;; + try-restart) + check_status + if [ "$?" -eq 0 ]; then + exec $0 restart + else + # LSB says to return 0 in try-restart if the service is + # not running. + exit 0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2 + exit 1 + ;; +esac + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/deletable.files +++ cyrus-imapd-2.2-2.2.13/debian/deletable.files @@ -0,0 +1,98 @@ +doc/man/arbitron.8.html +doc/man/chk_cyrus.8.html +doc/man/ctl_cyrusdb.8.html +doc/man/ctl_deliver.8.html +doc/man/ctl_mboxlist.8.html +doc/man/cvt_cyrusdb.8.html +doc/man/cyr_expire.8.html +doc/man/cyradm.1.html +doc/man/cyrus.conf.5.html +doc/man/deliver.8.html +doc/man/fetchnews.8.html +doc/man/fud.8.html +doc/man/idled.8.html +doc/man/imapd.8.html +doc/man/imapd.conf.5.html +doc/man/imclient.3.html +doc/man/imtest.1.html +doc/man/installsieve.1.html +doc/man/ipurge.8.html +doc/man/krb.equiv.5.html +doc/man/lmtpd.8.html +doc/man/lmtptest.1.html +doc/man/master.8.html +doc/man/mbexamine.8.html +doc/man/mbpath.8.html +doc/man/mupdatetest.1.html +doc/man/nntpd.8.html +doc/man/nntptest.1.html +doc/man/notifyd.8.html +doc/man/pop3d.8.html +doc/man/pop3test.1.html +doc/man/quota.8.html +doc/man/reconstruct.8.html +doc/man/rmnews.8.html +doc/man/sieveshell.1.html +doc/man/sivtest.1.html +doc/man/smmapd.8.html +doc/man/smtptest.1.html +doc/man/squatter.8.html +doc/man/syncnews.8.html +doc/man/timsieved.8.html +doc/man/tls_prune.8.html +doc/man/w +doc/murder.png +doc/netnews.png +doc/text/altnamespace +doc/text/anoncvs +doc/text/bugs +doc/text/changes +doc/text/faq +doc/text/feedback +doc/text/index +doc/text/install +doc/text/install-admin-mb +doc/text/install-auth +doc/text/install-compile +doc/text/install-configure +doc/text/install-murder +doc/text/install-netnews +doc/text/install-perf +doc/text/install-prereq +doc/text/install-sieve +doc/text/install-snmpmon +doc/text/install-testing +doc/text/install-upgrade +doc/text/install-virtdomains +doc/text/mailing-list +doc/text/man +doc/text/notes +doc/text/os +doc/text/overview +doc/text/questions +doc/text/readme +doc/text/sieve +doc/text/sieve-protocol +doc/text/specs +imap/imap_err.c +imap/imap_err.h +imap/lmtpstats.c +imap/lmtpstats.h +imap/mupdate_err.c +imap/mupdate_err.h +imap/nntp_err.c +imap/nntp_err.h +imap/pushstats.c +imap/pushstats.h +lib/imapopts.c +lib/imapopts.h +man/imapd.conf.5 +man/sieveshell.1 +sieve/addr-lex.c +sieve/addr.c +sieve/addr.h +sieve/sieve-lex.c +sieve/sieve.c +sieve/sieve.h +sieve/sieve_err.c +sieve/sieve_err.h --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.links @@ -0,0 +1 @@ +usr/share/doc/cyrus-doc-2.2 usr/share/doc/cyrus-common-2.2/docs --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.lintian +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.lintian @@ -0,0 +1,2 @@ +cyrus-common-2.2: no-debconf-config +cyrus-common-2.2: postinst-uses-db-input --- cyrus-imapd-2.2-2.2.13.orig/debian/README.sendmail +++ cyrus-imapd-2.2-2.2.13/debian/README.sendmail @@ -0,0 +1,69 @@ +Setting up Cyrus IMAPd for Sendmail (Debian) +$Id: README.sendmail 681 2006-10-25 17:42:18Z astronut $ +=========================================================== + +[This is user-contributed, unverified information] + +First, do *not* use the old cyrus*.m4 macros, they won't work well. The one +you can use is cyrusv2.m4. There are many methods of connecting Cyrus to +sendmail, and replacing the local mailer with Cyrus lmtpd is just one of +them. + +Andrzej Filip says: +http://anfi.homeunix.net/sendmail/localNalias.html + Cyrus Aliases + It allows to use user@CYRUS redirections in virtusertable, + aliases and .forward file e.g. I use the following ~anfi/.forward: + anfi@CYRUS + +http://anfi.homeunix.net/sendmail/localtab.html + Local Table + +http://anfi.homeunix.net/sendmail/rtcyrus2.html + Real Time Cyrus Integration + It allows sendmail to check presence of cyrus mailbox in real time, + sendmail rejects message to non existing cyrus mailboxes in reply to + "RCPT TO:" + + +I am not sure how well these will work with sieve. The one report I have +for Cyrus + sendmail with working sieve is: + +"cyrus/sieve vacation seems to work only if you integrate cyrus via +cyrusv2.m4 into sendmail (8.12.3-4)." + +Sample sendmail.mc that seems to work: +-------- +[...] +dnl define BIND_OPTS',`-DNSRCH -DEFNAMES')dnl +define(`confLOCAL_MAILER', `cyrusv2')dnl +MAILER(`local')dnl +MAILER(`smtp')dnl +MAILER(`cyrusv2')dnl +dnl MODIFY_MAILER_FLAGS(`cyrus',`+w')dnl + +LOCAL_RULE_0 +Rbb + $+ < @ $=w . > $#cyrusbb $: $1 +[...] +-------- + +Here's a sieve test script you can try. Change it as needed for your +site: + +require "fileinto"; +require "vacation"; +require "envelope"; + +if header :contains "subject" "vactest" { + vacation :days 7 :addresses ["me@home.de"] "vactest!"; +} + + +Pierre Gambarotto says: +The minimum in order to make it work with sendmail is: + +define(`confLOCAL_MAILER', `cyrusv2') +define(`CYRUSV2_MAILER_ARGS',`FILE /var/run/cyrus/socket/lmtp') +MAILER(`cyrusv2') + +The CYRUSV2_MAILER_ARGS is the key. --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.dirs @@ -0,0 +1 @@ +usr/bin --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.dirs @@ -0,0 +1,2 @@ +usr/sbin +usr/lib/cyrus --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.dirs @@ -0,0 +1 @@ +usr/bin --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.links @@ -0,0 +1,2 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-dev-2.2 + --- cyrus-imapd-2.2-2.2.13.orig/debian/arbitronsort.8 +++ cyrus-imapd-2.2-2.2.13/debian/arbitronsort.8 @@ -0,0 +1,15 @@ +.TH ARBITRONSORT "8" "Project Cyrus" "CMU" +.SH NAME +arbitronsort \- sorts arbitron(8) output +.SH SYNOPSIS +.B +arbitronsort +.SH DESCRIPTION +.PP +This tool takes the output of arbitron (run without the -o option) +on stdin and prints out first a ranking of mailboxes by number of +people who selected the mailbox, and then a ranking of mailbox by +number of subscribers. +.SH SEE ALSO +.PP +\fBarbitron(8)\fR --- cyrus-imapd-2.2-2.2.13.orig/debian/license.html +++ cyrus-imapd-2.2-2.2.13/debian/license.html @@ -0,0 +1,161 @@ + + + + + +Cyrus IMAP Licensing + + + + +

+ + +Masthead
+ + + + +
+Cyrus IMAP Licensing +
+		 + + +ASG Home   + + + +What's New   + + + +Jobs   + + + +Search   + + + +Contact Us  
+ + + + +Download Software   + + + +Mailing lists   + + + +Project Cyrus Home   +
+ + + +
+
+

+ + +Please direct technical questions or issues to cyrus-bugs@andrew.cmu.edu. +
+Please direct any licensing issues to tech-transfer@andrew.cmu.edu. +

+ +ALL versions of the Cyrus IMAP server are now covered by the +following copyright message. However, please note that in + distributions before 2.0, there may still be files that have the old + copyright text. + +
+ + * Copyright (c) 1994-2000 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +
+ +

+If you find this software useful and valuable in your work, we welcome +any support you can offer toward continuing this work. + +

We gratefully accept contributions, whether intellectual or +monetary. Intellectual contributions in the form of code or +constructive collaboration can be directed to cyrus-bugs+@andrew.cmu.edu +(even if it is not a bug). + +

If you wish to provide financial support to the Cyrus Project, send a +check payable to Carnegie Mellon University to + +

+ + Project Cyrus + Computing Services + Carnegie Mellon University + 5000 Forbes Ave + Pittsburgh, PA 15213 + USA + +
+
+

+Please direct technical questions or issues to cyrus-bugs@andrew.cmu.edu. +
+Please direct any licensing issues to tech-transfer@andrew.cmu.edu. + +

+

+
+ +Last Updated: Thursday, 12-Oct-2000 16:38:41 EDT + + + + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.default +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default @@ -0,0 +1,40 @@ +# Defaults for Cyrus IMAPd 2.2 scripts +# $Id: cyrus-common-2.2.cyrus2.2.default 681 2006-10-25 17:42:18Z astronut $ +# sourced by /etc/init.d/cyrus2.2, /usr/sbin/cyrus-makedirs +# installed at /etc/default/cyrus2.2 by the maintainer scripts +# + +# +# This is a POSIX shell fragment +# + +# Set this to 1 or higher to enable debugging on cyrmaster +#CYRUS_VERBOSE=1 + +# Socket listen queue backlog size +# See listen(2). Default is 32, you may want to increase +# this number if you have a very high connection rate +#LISTENQUEUE=32 + +# Wether cyrus-makedirs should optimize filesystems +# or not. Switch it off if you are going to do your +# own optimizations. Set to 1 to enable, 0 to disable +#CYRUSOPTFILESYS=1 + +# The default Cyrus IMAP config file that the scripts should +# use. You better know what you're doing if you change this +#CONF=/etc/imapd.conf + +# The default cyrus master config file that the scripts shoud +# use. You better know what you're doing if you change this. +#MASTERCONF=/etc/cyrus.conf + +# Check spool condition with chk_cyrus on daily cronjob +# Set to 1 to enable, default is disabled +#CHKCYRUS=0 + +# Set the path to the PID file +#PIDFILE=/var/run/cyrmaster.pid + +# Set other Options here. +OPTIONS="" --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus22.cron.daily +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily @@ -0,0 +1,74 @@ +#!/bin/sh +# Cyrus IMAPd daily maintenance script +# Copyright (c) 2002,2003 by Henrique M. Holschuh +# $Id: cyrus-common-2.2.cyrus22.cron.daily 681 2006-10-25 17:42:18Z astronut $ +# Distributed under the terms of the GNU General Public License version 2 +# +# This script: +# 1. Backups the mailbox database to the portable text format, +# and compresses the result. This backup can be used to restore +# the Cyrus mailbox database using ctl_mboxlist (after uncompressing +# the backup file). +# +# 2. Cleans up any leftover crap in .stage directories. +# +# 3. Runs chk_cyrus and outputs warning messages (so that cron +# sends them to the administrator) if any problems are detected. + +set -e + +# Make sure we get sane behaviour in broken locales +LC_ALL=C +export LC_ALL + +bak=/var/backups +bakfile=${bak}/cyrus-mboxlist.txt.gz +CONF=/etc/imapd.conf +CHKCYRUS=0 +[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2 +umask 022 + +# check wether ctl_mboxlist and cyrus-hardwired-config.txt exist +# exit cleanly if they don't +[ -x /usr/sbin/ctl_mboxlist ] \ +&& [ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] \ +|| exit 0 +# Check if Cyrus 2.2 is installed (vs. removed but not purged) +grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \ + /usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0 + +# 1. backup mailbox database +[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak ) +[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak +# su "--command=/usr/sbin/ctl_mboxlist -d" - cyrus | ... +start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile} + +# 2. clean up all leftover .stage directories in all spools listed in +# the default config file +[ $CHKCYRUS -ne 0 ] && { + [ -r "$CONF" ] || { + echo $0: unable to read configuration file $CONF. Aborting... + exit 1 + } + partitions=$(sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \ + s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \ + p + } " < "$CONF" | sort | uniq | xargs) + for i in $partitions ; do + find "$i" -name '.stage' -type d -print0 | \ + xargs --null -n 1 -r -i'{1}' \ + find {1} -type f -ctime +1 -exec rm -f {} \; + done +} + +# 3. runs chk_cyrus +[ -x /usr/sbin/chk_cyrus ] && { + tmpfile=$(mktemp -t cyrus-daily-cronjob.XXXXXXXXXX) + trap 'rm -f "${tmpfile}"' 0 +# su "--command=/usr/sbin/chk_cyrus" - cyrus | ... + start-stop-daemon --start --exec /usr/sbin/chk_cyrus --quiet --chuid cyrus >"${tmpfile}" 2>&1 || cat "${tmpfile}" 1>&2 + rm -f "${tmpfile}" + trap '' 0 +} + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.links @@ -0,0 +1 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-nntpd-2.2 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyradm-16x16.xpm +++ cyrus-imapd-2.2-2.2.13/debian/cyradm-16x16.xpm @@ -0,0 +1,45 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"16 16 23 1", +" c Gray0", +". c #191919", +"X c Gray20", +"o c #00007f", +"O c #007f00", +"+ c #007f7f", +"@ c #7f0000", +"# c #7f007f", +"$ c #7f7f00", +"% c #4c4c4c", +"& c #666667", +"* c Gray50", +"= c Blue", +"- c Green", +"; c Cyan", +": c Red", +"> c Magenta", +", c Yellow", +"< c Gray60", +"1 c #b2b2b2", +"2 c Gray80", +"3 c Gray90", +"4 c Gray100", +/* pixels */ +"22111;1212211111", +"211221213<121221", +"2111212232<11122", +"121121221<231<11", +"2112232<34334112", +"1112222243213212", +";2221<11*&<<*<<1", +"1221233323232231", +"2233223333332&1<", +"2213123333233*1*", +"123312121222233*", +"1233212<<213223<", +"12331<1<<11<123*", +"123333322222223*", +"123223322222323*", +"2<&%%%X%%%%X%%X%" +}; --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.links @@ -0,0 +1,2 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-pop3d-2.2 + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.links +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.links @@ -0,0 +1 @@ +usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-imapd-2.2 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.postinst +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.postinst @@ -0,0 +1,156 @@ +#! /bin/sh +# postinst script for cyrus-common-2.2 +# Copyright (c) 2002 by Henrique de Moraes Holschuh +# Distributed under the GNU General Public License version 2 +# $Id: cyrus-common-2.2.postinst 681 2006-10-25 17:42:18Z astronut $ +# +# see: dh_installdeb(1) + +# debconf hook +. /usr/share/debconf/confmodule + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +export PATH=/sbin:/usr/sbin:/bin:/usr/bin + +verifydb() { + while read -r DBKEY DBVALUE ; do + match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1` + [ "x${match}" != "x${DBVALUE}" ] && return 0 + done + return 1 +} + +verifydbkey() { + while read -r DBKEY DBVALUE ; do + if [ "${DBKEY}" = "$2" ] ; then + match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1` + [ "x${match}" != "x${DBVALUE}" ] && return 0 + fi + done + return 1 +} + +case "$1" in + configure) + # Add the cyrus user (requires adduser >= 3.34) + echo "Creating/updating cyrus user account..." + adduser --quiet --system --ingroup mail --home /var/spool/cyrus \ + --shell /bin/sh --no-create-home --disabled-password \ + --gecos "Cyrus Mailsystem User" cyrus >/dev/null || { + if getent passwd | grep -s -q -E '^cyrus:'; then + echo "Non-system user cyrus found. I will not overwrite a non-system" >&2 + echo "user. Remove the user and reinstall cyrus-common-2.2." >&2 + exit 1 + fi + # unknown adduser error, simply exit + exit 1 + } + + # Force correct owner and modes + dpkg-statoverride --list /var/lib/cyrus 2>&1 >/dev/null || + dpkg-statoverride --update --add cyrus mail 750 /var/lib/cyrus + dpkg-statoverride --list /var/spool/cyrus 2>&1 >/dev/null || + dpkg-statoverride --update --add cyrus mail 755 /var/spool/cyrus + dpkg-statoverride --list /var/spool/sieve 2>&1 >/dev/null || + dpkg-statoverride --update --add cyrus mail 755 /var/spool/sieve + dpkg-statoverride --list /var/run/cyrus 2>&1 >/dev/null || + dpkg-statoverride --update --add cyrus mail 755 /var/run/cyrus + dpkg-statoverride --list /var/run/cyrus/socket 2>&1 >/dev/null || + dpkg-statoverride --update --add cyrus mail 750 \ + /var/run/cyrus/socket + + # Add user cyrus to group SASL, if such group exists + adduser cyrus sasl || true + + # Convert the spool to the proper mode, if needed (autodetects + # only Debian's default spool, this codepath is meant for package + # upgrades only) + # DISABLED, since rehash seems busted + #[ -d /var/spool/cyrus/mail/A ] && { + # echo Converting spools to basic hash scheme... + # #su - cyrus -c "/usr/lib/cyrus/upgrade/rehash basic" + # start-stop-daemon --start --exec /usr/lib/cyrus/upgrade/rehash --chuid cyrus:mail --verbose -- basic + #} + + # Parse imapd.conf and generate all required directories... + # also kill any left over squatter indexes + /usr/sbin/cyrus-makedirs --cleansquat + + # Deal with database type information + if [ -f /usr/lib/cyrus/cyrus-db-types.active ] ; then + # is it safe to start cyrmaster? compare "key value" pairs + # from the (old) active database types file with the new one + if verifydb /usr/lib/cyrus/cyrus-db-types.txt \ + < /usr/lib/cyrus/cyrus-db-types.active ; then + db_input high cyrus-common-2.2/warnbackendchange || true + db_go || true + else + cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active + db_fset cyrus-common-2.2/warnbackendchange seen false || true + fi + else + [ -f /usr/lib/cyrus/cyrus-db-types.txt ] && \ + cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active + db_fset cyrus-common-2.2/warnbackendchange seen false || true + fi + + # Deal with hardwired config changes + if [ -f /usr/lib/cyrus/cyrus-hardwired-config.active ] ; then + # do we need to do something about a spool hash type change + # if verifydbkey /usr/lib/cyrus/cyrus-hardwired-config.txt USE_DIR_FULL \ + # < /usr/lib/cyrus/cyrus-hardwired-config.active ; then + # ... (do hash conversion)... + # fi + cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \ + /usr/lib/cyrus/cyrus-hardwired-config.active + else + [ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] && \ + cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \ + /usr/lib/cyrus/cyrus-hardwired-config.active + fi + + # No leaking of debconf file handles to the initscript stuff + db_stop + + # Register initscript, and start it (it is ok if start fails) + [ -x /etc/init.d/cyrus2.2 ] && { + update-rc.d cyrus2.2 defaults >/dev/null + invoke-rc.d cyrus2.2 start || true + } + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +db_stop + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.preinst +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.preinst @@ -0,0 +1,58 @@ +#! /bin/sh +# preinst script for cyrus-common-2.2 +# Copyright (c) 2006 by Sven Mueller +# Distributed under the GNU General Public License version 2 +# $Id: cyrus-common-2.2.preinst 681 2006-10-25 17:42:18Z astronut $ +# +# see: dh_installdeb(1) + +set -e + +# debconf hook +. /usr/share/debconf/confmodule + +# summary of how this script can be called: +# upgrade +# install +# abort-upgrade +# for details, see /usr/doc/packaging-manual/ + +case "$1" in + upgrade) + # old version was fully installed + if dpkg --compare-versions "$2" lt "2.2.13-4bpo1"; then + # Upgrading from a version which used a wrong + # filename for the daily cronjob + if [ -f /etc/cron.daily/cyrus-common-2.2 ] \ + && [ ! -f /etc/cron.daily/cyrus22 ]; then + mv -f /etc/cron.daily/cyrus-common-2.2 /etc/cron.daily/cyrus22 + fi + fi + ;; + install) + # old version was in "configuration files only" state + if dpkg --compare-versions "$2" lt "2.2.13-4bpo1"; then + # Upgrading from a version which used a wrong + # filename for the daily cronjob + if [ -f /etc/cron.daily/cyrus-common-2.2 ] \ + && [ ! -f /etc/cron.daily/cyrus22 ]; then + mv -f /etc/cron.daily/cyrus-common-2.2 /etc/cron.daily/cyrus22 + fi + fi + ;; + abort-upgrade) + # upgrade failed after unpack - error unwind is tried + # however, if it works, new-postrm is also called with abort-upgrade + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.manpages +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.manpages @@ -0,0 +1,2 @@ +man/fetchnews.8 +man/nntpd.8 --- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.database +++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.database @@ -0,0 +1,132 @@ +Cyrus IMAP for Debian: Database backend conversion +$Id: README.Debian.database 681 2006-10-25 17:42:18Z astronut $ +-------------------------------------------------- + + "All systems administrators have their horror stories. For me, it was + setting up a HP Color Bubblejet under Linux using ghostscript before + linuxprinting.org was alive. Well that was a piece of cake compared + to what I am about to describe in this document." + -- "Hosting email for virtual domains using Postfix and Cyrus" + Haim Dimermanas, 2001-08-01 + + "I warned you to read all the documentation first, didn't I?" + -- Henrique M. Holschuh, 2002-10-01 + +For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/. +There is also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO +collection. Upgrade hints are in UPGRADE.Debian. Outdated documentation will +cause you much grief, so beware of that when hunting anywhere else than the +Cyrus mailinglist for information. + + +Database backends +----------------- + +Cyrus can be compiled to use different types of database backends for each of +its databases. The package will warn you if you try to start Cyrus and the +database backends seem to have changed since the last active version. + +After converting all the mail stores and /var/lib/cyrus to use the proper +database backends using cvt_cyrusdb(8), remove +/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus-common-2.2" +once to reset the error trigger, and start cyrmaster. + +If cvt-cyrusdb locks up just at the beginning of the conversion, your databases +might be locked. Unlock them (i.e. REALLY stop Cyrus if it is still running, +use the db* utilities (from the older Berkeley DB version) to clean any stray +locks, or try a reboot). + +IMPORTANT: If you changed the type of any of the databases through imapd.conf, + cyrus-db-types.txt isn't updated to match those. Be sure to cross-check + imapd.conf if you did that. + + +Step-by-step conversion guide: + +1. Stop the Cyrus system + /etc/init.d/cyrus2.2 stop + +2. Find out which databases to convert: + diff -u /usr/lib/cyrus/cyrus-db-types.active \ + /usr/lib/cyrus/cyrus-db-types.txt + + The databases are these in the default install: + DUPLICATE /var/lib/cyrus/deliver.db + MBOX /var/lib/cyrus/mailboxes.db + TLS /var/lib/cyrus/tls_sessions.db + + Don't bother upgrading the TLS database, just delete it: the information + there is not reused when you stop Cyrus. + + If the BerkeleyDB version is what was changed, you need to use the + Berkeley DB upgrade utility in all db* databases. See the manpages for + db*_upgrade. Note that you need to use the db*_upgrade utility with the + same version as given on the DBENGINE line of cyrus-db-types.txt. + You should look for lines with 'berkeley' or 'berkeley_nosync' on + the right side. You can safely ignore lines with 'flat', 'skiplist' or + 'quotalegacy'. + + The SUBS and SEEN databases are different: there are many of them (one + for every user for SEEN and SUBS respectively) and you need to convert + every single one of them. + + SUBS /var/lib/cyrus/...../*.sub + SEEN /var/lib/cyrus/...../*.seen + + SUBS contains the subscribed folders, and SEEN contains the seen state + of every mail in a folder. + + Types db3_nosync and db3 are the same for database conversion matters. + +2.1 Converting from DB* to SKIPLIST + + As user cyrus, do the following: + + cd / + /usr/sbin/cvt_cyrusdb db3 \ + /var/lib/cyrus/temp.db flat + rm -f + /usr/sbin/cvt_cyrusdb /var/lib/cyrus/temp.db flat \ + skiplist + chown cyrus:mail + rm -f /var/lib/cyrus/temp.db + +2.2 Converting from FLAT to SKIPLIST + + As user cyrus, do the following: + + cd / + mv .old + /usr/sbin/cvt_cyrusdb .old flat \ + skiplist + chown cyrus:mail + rm -f .old + +2.3 SUBS and SEEN databases + + I suggest using a small shell script and using "find" to mass-convert + the SEEN databases: + find /var/lib/cyrus -type f -name '*.seen' -exec myshellscript {} \; + + The "find" command above gives you the name of the database as "$1" + inside your shell script. + +3. Reset the database backend change system + rm /usr/lib/cyrus/cyrus-db-types.active + dpkg-reconfigure cyrus-common-2.2 + +4. Start Cyrus, if not started by step 3 + /etc/init.d/cyrus2.2 start + +WHY THERE IS NO AUTOMATED UPGRADE SCRIPT: Because I dislike people who do not +read docs, and one Debian user asked me exactly the wrong thing (about +cyrus21-imapd) while I was in the middle of writing said script AND I am quite +short on time lately: it is much faster to write a doc than to write and test +the script. So, now everyone will need to read the docs to get Cyrus working +again. I am not holding back the skiplist change for that script anymore. + +Maybe someday I will finish the upgrade script. Maybe someone else will write +one (I will certainly include it in the package, if it is good enough). Don't +hold your breath, though. + + -- Henrique de Moraes Holschuh --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.manpages +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.manpages @@ -0,0 +1,23 @@ +debian/tmp/usr/share/man/man5/cyrus.conf.5 +debian/tmp/usr/share/man/man5/imapd.conf.5 +debian/tmp/usr/share/man/man8/cyrus-makedirs.8 +debian/tmp/usr/share/man/man8/cyrdump.8 +debian/tmp/usr/share/man/man8/mbpath.8 +debian/tmp/usr/share/man/man8/arbitron.8 +debian/tmp/usr/share/man/man8/arbitronsort.8 +debian/tmp/usr/share/man/man8/timsieved.8 +debian/tmp/usr/share/man/man8/notifyd.8 +debian/tmp/usr/share/man/man8/lmtpd.8 +debian/tmp/usr/share/man/man8/ctl_*.8 +debian/tmp/usr/share/man/man8/cvt_*.8 +debian/tmp/usr/share/man/man8/chk_*.8 +debian/tmp/usr/share/man/man8/fud.8 +debian/tmp/usr/share/man/man8/ipurge.8 +debian/tmp/usr/share/man/man8/tls_prune.8 +debian/tmp/usr/share/man/man8/cyrdeliver.8 +debian/tmp/usr/share/man/man8/cyrmaster.8 +debian/tmp/usr/share/man/man8/cyrreconstruct.8 +debian/tmp/usr/share/man/man8/cyrquota.8 +debian/tmp/usr/share/man/man8/mbexamine.8 +debian/tmp/usr/share/man/man8/smmapd.8 +debian/tmp/usr/share/man/man8/cyr_expire.8 --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.install +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.install @@ -0,0 +1,3 @@ +usr/lib/*.a +usr/include/cyrus/* +usr/share/man/man3/imclient* --- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian +++ cyrus-imapd-2.2-2.2.13/debian/README.Debian @@ -0,0 +1,334 @@ +Cyrus IMAP for Debian +$Id: README.Debian 681 2006-10-25 17:42:18Z astronut $ +--------------------- + + "All systems administrators have their horror stories. For me, it was + setting up a HP Color Bubblejet under Linux using ghostscript before + linuxprinting.org was alive. Well that was a piece of cake compared + to what I am about to describe in this document." + -- "Hosting email for virtual domains using Postfix and Cyrus" + Haim Dimermanas, 2001-08-01 + + "I warned you to read all the documentation first, didn't I?" + -- Henrique M. Holschuh, 2002-10-01 + +IMPORTANT: Cyrus is a closed-box email system. Your system will access your +email through LMTP, IMAP and POP3 *only*. No direct file access to the email +store is supposed to take place. + +For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/ and +http://asg.web.cmu.edu/twiki/bin/view/Cyrus/WebHome (Cyrus WiKi). There is +also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO +collection. Upgrade hints are in UPGRADE.Debian.gz Outdated documentation +will cause you much grief, so beware of that when hunting anywhere else than +the Cyrus mailinglist for information. + +Backports of the latest packages for Debian Stable are available from +http://www.backports.org + +WARNING: For one to get Cyrus IMAPd to work correctly, one must first get the +SASL layer to work correctly. This is far from trivial, so if you don't manage +at first, don't go around filling bugs against Cyrus IMAPd before you make damn +sure it is not a SASL configuration error. Read the hint list later on this +file as well. Start by reading README.Debian.simpleinstall. + +The Debian packaging of Cyrus has a few quirks which are important to know +about: + +1. Renaming of some Cyrus IMAP utilities + + The quota, reconstruct, master and deliver utilities have been renamed to + cyrquota, cyrreconstruct, cyrmaster and cyrdeliver, following the template + set by upstream with "cyradm". This was done because both Cyrus Debian + maintainers found the original names to be too generic and likely to cause + namespace collisions later. + + Since documentation may refer to these utilities using their original + name, you must be aware of this fact. Also, installsieve is deprecated + and will be removed from the Debian package in the future; use sieveshell + instead. + +2. Relocation of many Cyrus IMAP files + + The default Cyrus install scatters files all over the place. The Debian + package installs only a few files in /usr/bin (cyradm, sieveshell). + IMAP/email administrator utilities are installed in /usr/sbin (such as + cyrreconstruct). Programs that must be run by cyrmaster are installed in + /usr/lib/cyrus (such as imapd and pop3d). Sockets go into + /var/run/cyrus/socket, per FHS 2.2. Sieve files go in /var/spool/sieve, but + an /etc/sieve compatibility symlink is also installed just in case. + + The imapd.conf and cyrus.conf configuration files are in /etc. The PAM + policy files are in /etc/pam.d. + + Feel free to use dpkg-statoverride to change the permission of + /var/run/cyrus/socket, the cyrus packages will not override your + configuration if dpkg-statoverride is used. In fact, you will most likely + have to do so for postfix to deliver to Cyrus, for example. + +3. Cyrus Murder, the Cyrus IMAPd/POP3 aggregator is available. + + However, you will have to configure it yourself. No pre-packaged + configuration of Murder is available at this time... The documentation is + all there, and the Cyrus packages will happily preserve your Cyrus Murder + configuration. You do not have to install the cyrus-imapd-2.2 or + cyrus-pop3d-2.2 packages in hosts that only need the proxy daemons running, + but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those + packages (and they are needed by the proxies), so you will have to create + the files manually. + + One important note: MUPDATE doesn't support TLS, so you won't be able to + use plaintext authentication methods. The easiest thing to do is to put + an entry for your mupdate user in sasldb2 and use DIGEST-MD5. + +4. Configurable idled support. + + Cyrus IMAPd supports three options of using IDLE in IMAP sessions. The first + option is not to support IDLE at all. The second is to use internal polling + in the IMAP daemon. The third option is to use an external daemon, idled. + Upstream only supports configuration of this during compilation, Debian + however includes a patch which makes this runtime-configurable. Please + set the 'idlemethod' imapd.conf option according to your needs and enable + idled in cyrus.conf if you want to use it. + +General notes and hints: +------------------------ + + o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after + you upgrade the package. This, and every other NEWS.Debian can automatically + be shown to you before the upgrade, see the apt-listchanges package for more + information. + + o QUOTAS ARE LIMITIED TO 2GB on some platforms. + Be careful to not set quotas over that ammount if your platform doesn't + support the C datatype "long long". Things will break in very bad ways. + Yes, it is a big glitch, and no, there are no easy workarounds. + see https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1212 + This has been fixed for the upcoming Cyrus 2.3. + + o Either turn off logging of the DEBUG level, or don't complain about cyrus + verbosity on the logs. Don't ever ask in the mailing lists about messages + logged in the DEBUG level before reading the source code. + + o Watch out for your /dev/random bitbucket! SASL may use it, and if it + empties, it will hang the processes wrapped up by SASL. This means + just about every Cyrus service (lmtp, imap, pop3, sieve)... Disable + APOP in /etc/imapd.conf if you don't need it, as it is a serious draw + on randomness resources. + + o One extremely important point to notice is that saslauthd works ONLY + with plaintext. APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other "auxprop" + SASL mech will *not* work through saslauthd. This can and will cause + serious issues in Cyrus murder environments. + + o When using ext3, Cyrus really wants data=journal. However, up to + kernel 2.4.20 there are dangerous bugs in that option, so you're better + off not using that. xfs is faster and better for Cyrus, anyway. + Please note that sarge was shipped with 2.4.27, and etch will not ship + any 2.4 kernels anymore." + + 2.4 kernels are NOT shipped with Debian Etch. + + o nscd users: nscd is highly incompatible with ldap, and somewhat buggy + otherwise. If you use nscd and Cyrus segfaults on you, try restarting + nscd, or disabling it. + + o "The Debian libldap2 and cyrus-imapd packages are both compiled using the + SASL library. If you use cyrus-imapd together with libnss-ldap, or + saslauthd together with libpam-ldap, the resulting double calls to SASL + library functions can trigger a double-free bug which may cause the calling + process to crash. To avoid such a crash, you must recompile the libldap2 + package --without-cyrus-sasl." -- http://bugs.debian.org/145766 [!@#$%!!! + I didn't expect SASL 2.1 to still have this annoying problem] + + o The lmtp service (allocated in Debian Woody to port 2003, and non-existent + on Debian Sarge and Etch) is non-standard. It has no port officially + allocated anywhere; it is usually run bound to the localhost interface, + unless one needs it for clustering and high-availability scenarios. If you + need it elsewhere, by all means move it -- you only need to edit + /etc/services, or change the port for the lmtp service in /etc/cyrus.conf. + + o The lmtp service will only allow Cyrus lmtp administrators to authenticate. + Set them in /etc/imapd.conf. + + o Cyrus can now use two different namespaces (the standard one, where all + subfolders are children of INBOX, and one where they are all in the same + hierarchical level). + + See /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html for details. If + you deal with a large population of winboze users, this option can save + you some headaches. + + o One can also chose between netnews-style notation for folders + (INBOX.subfolder), where the "." character is reserved to separate folders; + or UNIX-style notation (INBOX/subfolder), where dots are allowed in names, + and the slash separate folders (the "^" character is reserved in this + mode). + + See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details. + + o When using SASL, do keep in mind that cyrus runs under user cyrus, and not + root. It cannot read shadow files (unless you add the user cyrus to group + shadow), or perform any root-only operations directly. You need to use the + saslauthd (or, if available, auxpropd) mechanism to authenticate against + root-only data. And that also means user cyrus must be able to talk to the + unix socket saslauthd uses (which is controlled by SASL, not Cyrus IMAPd). + + o Any of the SASL configure options can be inserted in imapd.conf, just + prefix it with "sasl_" (e.g.: sasl_mech_list: PLAIN). The list of SASL + options is in /usr/share/doc/libsasl2/options.html. + + o The services are tcp-wrapped. Their hosts.allow/hosts.deny id is the + service name in /etc/cyrus.conf. See hosts_access(5). + + o The PAM service names for use with SASL (via saslauthd) are: + "imap", "sieve", "lmtp", "pop", "mupdate". + + o You need to specify your admin users in /etc/imapd.conf before you can + add mailboxes, or deliver through authenticated lmtp. Do NOT use root. + We suggest user cyrus, which is already used by the system for all + things Cyrus IMAPd... but it need not be an existing user. As long as + SASL will authenticate against it, it will work. + + o Do NOT read your admin user's email via IMAP (see the FAQ for details). + + o Don't export your mail store over NFS or AFS (read the FAQ for more info). + You have been warned. You really want a journaled (as in journaling for the + metadata), local filesystem for the store. Failing that, you need + something with very strict and correct lock semantics, and full mmap + support. + + o Ext2 is slow on very large directories (right now), and sync metadata + writes enabled are a huge performance hit. If you need high IO throughput + from Cyrus, you will need to use ext3, reiserfs, xfs or something similar. + + o You may want to enable/disable synchronous metadata writes to your mail + store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more + info, in package cyrus-docs-2.2). The cyrus-makedirs script tries to do the + right thing for ext2 and ext3 filesystems. Failure to correctly update the + metadata in the right order can completely screw up your Cyrus store on a + power-loss or another disk failure. + + o Try mounting the store and cyrus database filesystems with noatime for + performance gains. Load-balance the store using multiple partitions on + different physical devices for even better performance gains. + + o Cyrus IMAPd should be fed mail through LMTP. If at all possible, use + the Unix socket for that -- it automatically authenticates as user + postman and that will help wonders. cyrdeliver can also be used to + inject mail, but it will simply open an LMTP socket to cyrus and + deliver through that -- this is much slower than using LMTP directly. + The UNIX socket is in /var/run/cyrus/socket/lmtp. Use dpkg-statoverride + if you need to change the permissions of the socket directory. + + o You can use /usr/sbin/cyrus-makedirs to generate the needed directories + for cyrus partitions. It is run automatically by the package postinst, + and it knows to parse the /etc/imapd.conf file to verify if hash + subdirectories are needed or not. It cannot detect what kind of hashing + should be used yet. If you recompile the package with full hashing, + change it. + + o Refer to cyrus-utils.sourceforge.net and the info-cyrus mailinglist + for mailbox/imap to cyrus conversion scripts. + + o If you don't have pop3 or something else enabled by default in cyrus.conf, + installed, disable it. Otherwise, Cyrus master will log warnings that the + service could not be started. + + o If you want to run something that is not in /usr/lib/cyrus/bin in + cyrus.conf, just use the full path in cyrus.conf (e.g.: + cmd="/usr/sbin/squatter"). + + o Sieveshell is really lacking on auth capabilities, and timsieved is quite + strict on what auth capabilities it offers. So, pay attention to + sasl_minimum_layer, and see bug #151925 for more details + (http://bugs.debian.org/151925). Also, make sure you have the correct set + of SASL2 modules installed in in your system. + + o uw-mailutils has some nice utilities to migrate mail stores from/to imap + servers. You might find it quite useful to migrate a site to Cyrus. + +Known bugs +---------- + + Please see +http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&data=cyrus-imapd-2.2& +archive=no&version= + for a list of any known bugs. + + +SNMP logging +------------ + +cyrmaster is an agentx SNMP subagent, and it can interface to a agentx SNMP +master. It will export data at OID .1.3.6.1.4.1.3.6.1 (cyrusMasterMIB). + +The ucd-snmp daemon (package snmpd) is NOT configured to work +as agentx master agent by default -- you have to do that manually, +by adding "master agentx" to the /etc/snmp/snmpd.conf file. + +cyrmaster will register with the snmp agentx master when it is started, +so if the snmp master is restarted after cyrmaster, it will not forward +the snmp requests to cyrmaster anymore. Check your system for any cron +scripts that might be restarting the snmp process if that happens. + +See /usr/share/snmp/mib/CYRUS-MASTER-MIB.txt for more details. + + +Backing up for rainy days +------------------------ + +Cyrus automatically checkpoints and backups some of its databases, using the +ctl_cyrusdb(8) utility (EVENTS in /etc/cyrus.conf). It is supposed to be also +capable of recovering automatically from these backups, and to attempt to do so +at startup. However, ctl_cyrusdb -r is NOT FULLY IMPLEMENTED YET... you are on +your own to recover from corrupt databases. + +This recovery can be done using the db3 utilities, and even by smart usage of +cvt_cyrusdb(8) and ctl_mboxlist(8). The automatic backups are useful, too, +even if they are not restored automatically. + +The database backups are stored at /var/lib/cyrus/db.backup*, you may want to +copy the files there to backup media in a cronjob, or something like that. You +can kill the TLS cache database, as long as Cyrus is stopped when you do it. +Loss of the delivery database is not very bad, it just means some users might +get duplicated messages. + +Cyrus does NOT backup the mail store automatically. To backup the mail store +partitions, you must stop Cyrus and dump the entire partition to your backup +media. The MH-like structure of the Cyrus store do make them suitable for +incremental backups. Hot-backups of the store can be made, but you risk losing +some non-critical metadata when the restore is done. + +You can backup all Cyrus non-text databases to a flat text file format using the +cvt_cyrusdb utility (and recover back from the flat text file format), but you +should stop Cyrus first. + +If you ever need to recover the mail store from backup, you should run +cyrreconstruct(8) to rebuild the mailbox indexes. + +A daily maintenance cronjob uses ctl_mboxlist(8) to dump the mailboxes database +to /var/backup. That backup copy can be used as a last-resort copy if the hot +backups become corrupted somehow. + + +Debian source package quirks +---------------------------- + +Patching is done using dpatch. Patches from upstream CVS are marked as such. + + +THANKS +------ + +Thanks go to the CMU crew for producing Cyrus IMAPd in the first place; +Michael-John Turner for maintaining the v1.5 branch and setting +the groundstones for the v2.1 package; David Parker and +David D. Kilzer for their huge help in getting +the v2.1 packages out-of-the-door, and the upgrade from v1.5 guide; Fabian +Fagerholm for stress testing the daemons, and useful +feedback; Gilles Bouthenot for good +feedback; and Henrique de Moraes Holschuh for maintaining the 2.1 branch. + + -- The Debian Cyrus Team + --- cyrus-imapd-2.2-2.2.13.orig/debian/logcheck.violations.ignore +++ cyrus-imapd-2.2-2.2.13/debian/logcheck.violations.ignore @@ -0,0 +1,7 @@ + +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [/a-zA-Z^]+/defaultbc: No such file or directory +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START)?TLS( negotiation)? failed: + --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.lintian +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.lintian @@ -0,0 +1 @@ +cyrus-admin-2.2: shell-script-fails-syntax-check ./usr/bin/cyradm --- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.dirs +++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.dirs @@ -0,0 +1 @@ +usr/lib/cyrus --- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.install +++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.install @@ -0,0 +1,2 @@ +usr/lib/perl* +usr/share/perl* --- cyrus-imapd-2.2-2.2.13.orig/debian/imap.pam +++ cyrus-imapd-2.2-2.2.13/debian/imap.pam @@ -0,0 +1,14 @@ +# PAM configuration file for Cyrus IMAP service +# $Id: imap.pam 681 2006-10-25 17:42:18Z astronut $ +# +# If you want to use Cyrus in a setup where users don't have +# accounts on the local machine, you'll need to make sure +# you use something like pam_permit for account checking. +# +# Remember that SASL (and therefore Cyrus) accesses PAM +# modules through saslauthd, and that SASL can only deal with +# plaintext passwords if PAM is used. +# + +@include common-auth +@include common-account --- cyrus-imapd-2.2-2.2.13.orig/debian/copyright +++ cyrus-imapd-2.2-2.2.13/debian/copyright @@ -0,0 +1,78 @@ +$Id: copyright 681 2006-10-25 17:42:18Z astronut $ + +This package was debianized by Henrique de Moraes Holschuh on +Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner + and David Parker . + +The Debian packaging of Cyrus IMAPd v2.2 is: + Copyright (c) 2002-2006 by Henrique de Moraes Holschuh , + Sven Mueller , + Benjamin Seidenberg + and distributed in the same license as the upstream source it applies to. + +The debian packages are maintained in a subversion repository at: + https://mail.incase.de/svn/cyrus22/ + +Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/. + +Upstream Author: Carnegie Mellon University +Upstream bugs: http://bugzilla.andrew.cmu.edu/ + +Patches: +The Debian version of Cyrus IMAP is heavily patched to adequate it to Debian, +and sometimes to add functionality. All such patches are submitted upstream to +CMU, for proper inclusion in Cyrus -- but not all of them will be accepted, of +course. See README.Debian for more details. Also, many patches from the +current CVS release of Cyrus IMAPd are folded in Debian updates; these are +identified by "patchset" numbers, created by the cvsps utility. + +The IPv6 patch by Hajimu UMEMOTO has been applied. + +CMU release tarballs are often repacked minus the CVS/ directories to avoid +problems in my build system. + +Copyright: +ALL versions of the Cyrus IMAP server are now covered by the +following copyright notice: + + * Copyright (c) 1994-2000 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +For more information, see http://asg.web.cmu.edu/cyrus/imapd/license.html +(local copy stored in /usr/share/doc/cyrus2-common/license.html) + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/00list +++ cyrus-imapd-2.2-2.2.13/debian/patches/00list @@ -0,0 +1,56 @@ +0001-upstream-fix-segfault.dpatch +0002-allow_invalid_id_acl_removal.dpatch +0003-upstream_disallow_userprobes.dpatch +0004-upstream-fetchnews-timezone-dst-fix.dpatch +0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch +0006-upstream-free-backend-fix.dpatch +0007-upstream-remove-undump-size-limit.dpatch +0008-upstream-better-message-track-logging.dpatch +0009-upstream-remove-redundant-wildcard-check.dpatch +0010-upstream-fix-libRSAglue-linkage.dpatch +0011-upstream-allow-compile-with-krb5-1.4.3.dpatch +0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch +0013-upstream-allow-report-above-4GB-mboxsize.dpatch +0014-upstream-fix-locks-during-reconstruction.dpatch +0015-upstream-fix-logic-error-in-imapoptions.dpatch +0016-upstream-fix-typos.dpatch +0017-upstream-no-body-empty-string-instead-of-null.dpatch +0018-upstream-ntohl-instead-of-htonl.dpatch +0019-upstream-sieve_allowreferrals.dpatch +0020-upstream-client-literal-prefix.dpatch +0090-fix-casts.dpatch +01-fix_Makefile.in.dpatch +02-add_mkinstalldirs.dpatch +03-fix_docs.dpatch +04-add_autogen.sh.dpatch +05-fix_programnames.dpatch +06-disable_runpath.dpatch +07-update_aclocal_and_configure.in.dpatch +08-clean_socket_closes.dpatch +09-kerberos-ipv4-ipv6-kludge-removal.dpatch +10-fix_potential_overflows.dpatch +11-fix_syslog_prefix.dpatch +12-fix_timeout_handling.dpatch +13-master_process_handling.dpatch +14-xmalloc.dpatch +15-munge_8bit.dpatch +16-fix_mib.dpatch +17-fix_tail_syntax_in_xversion.h.dpatch +18-fix_strlen_return_type.dpatch +19-fix_tls_ssl.dpatch +21-fix_config-parsing.dpatch +22-imapd_index_check.dpatch +23-configurable_idled.dpatch +25-update_install-sh.dpatch +30-update_perlcalling.sh.dpatch +35-masssievec_remove_unused_variable.dpatch +40-rehash_fix_pathes.dpatch +45-kolab2-annotations.dpatch +61-64bit-quota.dpatch +65-sieveshell-enhancements.dpatch +70-allow-larger-buffers.dpatch +72-faster-isdigit.dpatch +75-update-imapd.conf-documentation.dpatch +77-change-missing-sieve-notice.dpatch +80-kbsd-no-psstrings.dpatch +99-update-autoconf.dpatch --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0020-upstream-client-literal-prefix.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0020-upstream-client-literal-prefix.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream patch: Prefix client responses by C: + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imtest/imtest.c /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c +--- cyrus-imapd-2.2.13/imtest/imtest.c 2006-10-03 20:48:22.000000000 +0200 ++++ /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c 2006-10-03 20:55:16.098628728 +0200 +@@ -1,7 +1,7 @@ + /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client + * Ken Murchison (multi-protocol implementation) + * Tim Martin (SASL implementation) +- * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $ ++ * $Id: imtest.c,v 1.109 2006/08/30 16:58:49 murch Exp $ + * + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * +@@ -1083,7 +1083,8 @@ + + /* send to server */ + if (sendliteral) { +- printf("{%d+}\r\n", inbase64len); ++ printf("%s{%d+}\r\n", ++ initial_response ? "" : "C: ", inbase64len); + prot_printf(pout, "{%d+}\r\n", inbase64len); + prot_flush(pout); + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/19-fix_tls_ssl.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/19-fix_tls_ssl.dpatch @@ -0,0 +1,78 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 19-fix_tls_errormessage.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make TLS/SSL error message more informative + +@DPATCH@ +diff -urNad complete.dpatch/imap/tls.c /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c +--- complete.dpatch/imap/tls.c 2005-11-11 15:31:40.000000000 +0100 ++++ /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c 2005-11-11 15:31:41.926478833 +0100 +@@ -166,7 +166,7 @@ + * tim - this seems to just be giving logging messages + */ + +-static void apps_ssl_info_callback(SSL * s, int where, int ret) ++static void apps_ssl_info_callback(const SSL * s, int where, int ret) + { + char *str; + int w; +@@ -679,7 +679,7 @@ + s_key_file = config_getstring(IMAPOPT_TLS_KEY_FILE); + + if (!set_cert_stuff(s_ctx, s_cert_file, s_key_file)) { +- syslog(LOG_ERR,"TLS server engine: cannot load cert/key data"); ++ syslog(LOG_ERR,"TLS server engine: cannot load cert/key data, may be a cert/key mismatch?"); + return (-1); + } + SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb); +@@ -1098,7 +1098,7 @@ + + if (c_cert_file || c_key_file) { + if (!set_cert_stuff(c_ctx, c_cert_file, c_key_file)) { +- syslog(LOG_ERR,"TLS client engine: cannot load cert/key data"); ++ syslog(LOG_ERR,"TLS client engine: cannot load cert/key data, may be a cert/key mismatch?"); + return (-1); + } + } +diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c +--- complete.dpatch/imtest/imtest.c 2005-11-11 15:31:41.000000000 +0100 ++++ /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c 2005-11-11 15:31:57.244983198 +0100 +@@ -63,6 +63,7 @@ + + #include + #include ++#include + + #include + #include +@@ -418,7 +419,7 @@ + * tim - this seems to just be giving logging messages + */ + +-static void apps_ssl_info_callback(SSL * s, int where, int ret) ++static void apps_ssl_info_callback(const SSL * s, int where, int ret) + { + char *str; + int w; +@@ -531,7 +532,7 @@ + + if (c_cert_file || c_key_file) + if (!set_cert_stuff(tls_ctx, c_cert_file, c_key_file)) { +- printf("TLS engine: cannot load cert/key data\n"); ++ printf("TLS engine: cannot load cert/key data, maybe a cert/key mismatch?\n"); + return IMTEST_FAIL; + } + SSL_CTX_set_tmp_rsa_callback(tls_ctx, tmp_rsa_cb); +diff -urNad complete.dpatch/lib/imclient.c /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c +--- complete.dpatch/lib/imclient.c 2005-11-11 15:31:40.000000000 +0100 ++++ /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c 2005-11-11 15:31:41.928478637 +0100 +@@ -1733,7 +1733,7 @@ + + if (c_cert_file || c_key_file) + if (!set_cert_stuff(imclient->tls_ctx, c_cert_file, c_key_file)) { +- printf("[ TLS engine: cannot load cert/key data ]\n"); ++ printf("[ TLS engine: cannot load cert/key data, might be a cert/key mismatch]\n"); + return -1; + } + SSL_CTX_set_tmp_rsa_callback(imclient->tls_ctx, tmp_rsa_cb); --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0018-upstream-ntohl-instead-of-htonl by murch@andrew.cmu.edu +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use ntohl() instead of htonl() in mailbox_read_index_record() + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.20jd7v/cyrus-imapd-2.2.13/imap/mailbox.c +--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-08-06 20:03:02.000000000 +0200 ++++ /tmp/dpep.20jd7v/cyrus-imapd-2.2.13/imap/mailbox.c 2006-08-06 20:03:13.168502599 +0200 +@@ -1,5 +1,5 @@ + /* mailbox.c -- Mailbox manipulation routines +- * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $ ++ * $Id: mailbox.c,v 1.162 2006/08/04 14:40:54 murch Exp $ + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -884,20 +884,20 @@ + + buf = (unsigned char*) mailbox->index_base + offset; + +- record->uid = htonl(*((bit32 *)(buf+OFFSET_UID))); +- record->internaldate = htonl(*((bit32 *)(buf+OFFSET_INTERNALDATE))); +- record->sentdate = htonl(*((bit32 *)(buf+OFFSET_SENTDATE))); +- record->size = htonl(*((bit32 *)(buf+OFFSET_SIZE))); +- record->header_size = htonl(*((bit32 *)(buf+OFFSET_HEADER_SIZE))); +- record->content_offset = htonl(*((bit32 *)(buf+OFFSET_CONTENT_OFFSET))); +- record->cache_offset = htonl(*((bit32 *)(buf+OFFSET_CACHE_OFFSET))); +- record->last_updated = htonl(*((bit32 *)(buf+OFFSET_LAST_UPDATED))); +- record->system_flags = htonl(*((bit32 *)(buf+OFFSET_SYSTEM_FLAGS))); ++ record->uid = ntohl(*((bit32 *)(buf+OFFSET_UID))); ++ record->internaldate = ntohl(*((bit32 *)(buf+OFFSET_INTERNALDATE))); ++ record->sentdate = ntohl(*((bit32 *)(buf+OFFSET_SENTDATE))); ++ record->size = ntohl(*((bit32 *)(buf+OFFSET_SIZE))); ++ record->header_size = ntohl(*((bit32 *)(buf+OFFSET_HEADER_SIZE))); ++ record->content_offset = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_OFFSET))); ++ record->cache_offset = ntohl(*((bit32 *)(buf+OFFSET_CACHE_OFFSET))); ++ record->last_updated = ntohl(*((bit32 *)(buf+OFFSET_LAST_UPDATED))); ++ record->system_flags = ntohl(*((bit32 *)(buf+OFFSET_SYSTEM_FLAGS))); + for (n = 0; n < MAX_USER_FLAGS/32; n++) { +- record->user_flags[n] = htonl(*((bit32 *)(buf+OFFSET_USER_FLAGS+4*n))); ++ record->user_flags[n] = ntohl(*((bit32 *)(buf+OFFSET_USER_FLAGS+4*n))); + } +- record->content_lines = htonl(*((bit32 *)(buf+OFFSET_CONTENT_LINES))); +- record->cache_version = htonl(*((bit32 *)(buf+OFFSET_CACHE_VERSION))); ++ record->content_lines = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_LINES))); ++ record->cache_version = ntohl(*((bit32 *)(buf+OFFSET_CACHE_VERSION))); + return 0; + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/11-fix_syslog_prefix.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch @@ -0,0 +1,68 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11-fix_syslog_prefix.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make sure all programs log (to syslog) with "cyrus/" as the +## DP: log prefix. + +@DPATCH@ +diff -urNad complete.dpatch/imap/global.c /tmp/dpep.rKpUur/complete.dpatch/imap/global.c +--- complete.dpatch/imap/global.c 2005-11-11 13:12:47.000000000 +0100 ++++ /tmp/dpep.rKpUur/complete.dpatch/imap/global.c 2005-11-11 13:13:53.042398971 +0100 +@@ -93,6 +93,9 @@ + struct cyrusdb_backend *config_ptscache_db; + #endif + ++/* syslog prefix tag */ ++static char syslog_prefix[20]; ++ + /* Called before a cyrus application starts (but after command line parameters + * are read) */ + int cyrus_init(const char *alt_config, const char *ident, unsigned flags) +@@ -120,7 +123,9 @@ + + /* xxx we lose here since we can't have the prefix until we load the + * config file */ +- openlog(config_ident, LOG_PID, SYSLOG_FACILITY); ++ strncpy(syslog_prefix, "cyrus/", sizeof(syslog_prefix)); ++ strncat(syslog_prefix, ident, sizeof(syslog_prefix) - 7); ++ openlog(syslog_prefix, LOG_PID, SYSLOG_FACILITY); + + /* Load configuration file. This will set config_dir when it finds it */ + config_read(alt_config); +diff -urNad complete.dpatch/ptclient/ptexpire.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c +--- complete.dpatch/ptclient/ptexpire.c 2004-05-26 18:05:59.000000000 +0200 ++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c 2005-11-11 13:15:41.839710005 +0100 +@@ -114,7 +114,7 @@ + + if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); + +- openlog("ptexpire", LOG_PID, SYSLOG_FACILITY); ++ openlog("cyrus/ptexpire", LOG_PID, SYSLOG_FACILITY); + + while ((opt = getopt(argc, argv, "C:E:")) != EOF) { + switch (opt) { +diff -urNad complete.dpatch/ptclient/test.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c +--- complete.dpatch/ptclient/test.c 2003-10-22 20:50:29.000000000 +0200 ++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c 2005-11-11 13:16:19.409019154 +0100 +@@ -57,7 +57,7 @@ + cacheid=cache; + } else + cacheid=NULL; +- openlog("pttest", LOG_PID, SYSLOG_FACILITY); ++ openlog("cyrus/pttest", LOG_PID, SYSLOG_FACILITY); + + if (!auth_setid(argv[1],cacheid)) + printf ("Auth_memberof(%s,%s) is %d\n", argv[1], argv[2], +diff -urNad complete.dpatch/ptclient/test2.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c +--- complete.dpatch/ptclient/test2.c 2003-10-22 20:50:29.000000000 +0200 ++++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c 2005-11-11 13:16:39.749020971 +0100 +@@ -46,7 +46,7 @@ + + int main(void) { + char cacheid[16]="4224423"; +- openlog("testr", LOG_PID, SYSLOG_FACILITY); ++ openlog("cyrus/testr", LOG_PID, SYSLOG_FACILITY); + + if (!auth_setid("cg2v@club.cc.cmu.edu",cacheid)) + printf ("Auth_memberof(cg2v,cg2v:me) is %d\n", --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/05-fix_programnames.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/05-fix_programnames.dpatch @@ -0,0 +1,579 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05-fix_programnames_in_manpages.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix some minor things in manpages, fix program names in manpages and +## DP: program sources + +@DPATCH@ +diff -urNad complete.dpatch/imap/deliver.c /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c +--- complete.dpatch/imap/deliver.c 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c 2005-11-11 15:34:00.393958651 +0100 +@@ -99,7 +99,7 @@ + static void usage() + { + fprintf(stderr, +- "421-4.3.0 usage: deliver [-C ] [-m mailbox]" ++ "421-4.3.0 usage: cyrdeliver [-C ] [-m mailbox]" + " [-a auth] [-r return_path] [-l] [-D]\r\n"); + fprintf(stderr, "421 4.3.0 %s\n", CYRUS_VERSION); + exit(EC_USAGE); +diff -urNad complete.dpatch/imap/quota.c /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c +--- complete.dpatch/imap/quota.c 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c 2005-11-11 15:34:00.393958651 +0100 +@@ -208,7 +208,7 @@ + void usage(void) + { + fprintf(stderr, +- "usage: quota [-C ] [-d ] [-f] [prefix]...\n"); ++ "usage: cyrquota [-C ] [-d ] [-f] [prefix]...\n"); + exit(EC_USAGE); + } + +diff -urNad complete.dpatch/imap/reconstruct.c /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c +--- complete.dpatch/imap/reconstruct.c 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c 2005-11-11 15:34:00.394958554 +0100 +@@ -345,8 +345,8 @@ + void usage(void) + { + fprintf(stderr, +- "usage: reconstruct [-C ] [-p partition] [-rfx] mailbox...\n"); +- fprintf(stderr, " reconstruct [-C ] -m\n"); ++ "usage: cyrreconstruct [-C ] [-p partition] [-rfx] mailbox...\n"); ++ fprintf(stderr, " cyrreconstruct [-C ] -m\n"); + exit(EC_USAGE); + } + +diff -urNad complete.dpatch/man/chk_cyrus.8 /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8 +--- complete.dpatch/man/chk_cyrus.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8 2005-11-11 15:34:00.394958554 +0100 +@@ -83,4 +83,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/ctl_cyrusdb.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8 +--- complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:34:00.394958554 +0100 +@@ -94,4 +94,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/ctl_deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8 +--- complete.dpatch/man/ctl_deliver.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8 2005-11-11 15:34:00.395958456 +0100 +@@ -78,4 +78,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/ctl_mboxlist.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8 +--- complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:34:00.395958456 +0100 +@@ -138,4 +138,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/cyr_expire.8 /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8 +--- complete.dpatch/man/cyr_expire.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8 2005-11-11 15:34:00.395958456 +0100 +@@ -90,4 +90,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/cyrus.conf.5 /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5 +--- complete.dpatch/man/cyrus.conf.5 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5 2005-11-11 15:34:00.396958358 +0100 +@@ -44,9 +44,9 @@ + cyrus.conf \- Cyrus configuration file + .SH DESCRIPTION + \fB/etc/cyrus.conf\fR +-is the configuration file for the Cyrus \fBmaster\fR process. It ++is the configuration file for the Cyrus \fBcyrmaster\fR process. It + defines the startup procedures, services and events to be spawned by +-\fBmaster\fR. ++\fBcyrmaster\fR. + .PP + The \fB/etc/cyrus.conf\fR file consists of a series of entries divided + into sections of the form +@@ -105,7 +105,7 @@ + \fR[ \fIhost\fR \fB: \fR] \fIport\fR + .br + .sp +-where \fIpath\fR is the explicit path to a UNIX socket, \fIhost\fR is ++where \fIpath\fR is the explicit (absolute) path to a UNIX socket, \fIhost\fR is + either the hostname or bracket-enclosed IP address of a network + interface, and \fIport\fR is either a port number or service name (as listed + in \fB/etc/services\fR). +@@ -125,12 +125,22 @@ + The number of instances of this service to always have running and + waiting for a connection (for faster initial response time). This + integer value is optional. ++.br ++.sp ++For datagram-based services (udp), the maximum value of prefork is 1. + .IP "\fBmaxchild=\fR-1" 5 + The maximum number of instances of this service to spawn. A value of + -1 means unlimited. This integer value is optional. + .IP "\fBmaxfds=\fR256" 5 + The maximum number of file descriptors to which to limit this process. + This integer value is optional. ++.IP "\fBmaxforkrate=\fR0" 5 ++Maximum number of forks per second for this service. A value of zero ++means unlimited fork rate. This integer value is optional. ++.IP "\fBbabysit=\fR0" 5 ++Set to non-zero to guarantee that at least one child will always be ++available for new connections. The value of maxchild is ignored if all ++children are busy and babysit is active. This integer value is optional. + .SS EVENTS + This section lists processes that should be run at specific intervals, + similar to cron jobs. This section is typically used to perform +@@ -177,6 +187,6 @@ + still have separate access control rules. + .SH SEE ALSO + .PP +-\fBmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, ++\fBcyrmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, + \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, \fBctl_cyrusdb(8)\fR, + \fBctl_deliver(8)\fR, \fBtls_prune(8)\fR, \fBhosts_access(5)\fR +diff -urNad complete.dpatch/man/deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8 +--- complete.dpatch/man/deliver.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8 2005-11-11 15:34:00.396958358 +0100 +@@ -1,5 +1,5 @@ + .\" -*- nroff -*- +-.TH DELIVER 8 "Project Cyrus" CMU ++.TH CYRDELIVER 8 "Project Cyrus" CMU + .\" + .\" Copyright (c) 1998-2000 Carnegie Mellon University. All rights reserved. + .\" +@@ -41,9 +41,9 @@ + .\" + .\" $Id: deliver.8,v 1.18 2004/06/21 18:40:10 rjs3 Exp $ + .SH NAME +-deliver \- deliver mail to an IMAP mailbox ++cyrdeliver \- deliver mail to an IMAP mailbox + .SH SYNOPSIS +-.B deliver ++.B cyrdeliver + [ + .B \-C + .I config-file +@@ -76,7 +76,7 @@ + .I userid + ]... + .br +-.B deliver ++.B cyrdeliver + [ + .B \-C + .I config-file +@@ -146,7 +146,7 @@ + .B \-l + Accept messages using the LMTP protocol. + .SH NOTES +-Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver ++Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, cyrdeliver + either rejects messages with 8-bit-set characters in the headers or + changes these characters to `X'. + This is because such characters can't be interpreted since the +diff -urNad complete.dpatch/man/fud.8 /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8 +--- complete.dpatch/man/fud.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8 2005-11-11 15:34:00.396958358 +0100 +@@ -61,7 +61,7 @@ + ] + .SH DESCRIPTION + .B FUD +-is a long lived datagram daemon started from master that provides ++is a long lived datagram daemon started from cyrmaster that provides + information about when a user last + read their mail, when mail last arrived in a user's mailbox, and how + many messages are recent for that user. +diff -urNad complete.dpatch/man/idled.8 /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8 +--- complete.dpatch/man/idled.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8 2005-11-11 15:34:00.397958261 +0100 +@@ -56,7 +56,7 @@ + to report the changes to the client. + .I Idled + is usually started from +-.I master. ++.I cyrmaster. + .PP + .I Idled + reads its configuration options out of the +@@ -75,4 +75,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/imapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8 +--- complete.dpatch/man/imapd.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8 2005-11-11 15:34:00.397958261 +0100 +@@ -72,7 +72,7 @@ + is an IMAP4rev1 server. + It accepts commands on its standard input and responds on its standard output. + It MUST be invoked by +-.IR master (8) ++.IR cyrmaster (8) + with those descriptors attached to a remote client connection. + .PP + .I Imapd +@@ -148,4 +148,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/lmtpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8 +--- complete.dpatch/man/lmtpd.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8 2005-11-11 15:34:00.397958261 +0100 +@@ -68,7 +68,7 @@ + is an LMTP server used to deliver mail to the IMAP mailstore. + It accepts commands on its standard input and responds on its standard output. + It MUST be invoked by +-.IR master (8) ++.IR cyrmaster (8) + with those descriptors attached to a remote client connection. + .PP + .I Lmtpd +@@ -101,4 +101,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/master.8 /tmp/dpep.8HKnp3/complete.dpatch/man/master.8 +--- complete.dpatch/man/master.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/master.8 2005-11-11 15:34:00.398958163 +0100 +@@ -1,5 +1,5 @@ + .\" -*- nroff -*- +-.TH MASTER 8 "Project Cyrus" CMU ++.TH CYRMASTER 8 "Project Cyrus" CMU + .\" + .\" Copyright (c) 1996-2000 Carnegie Mellon University. All rights reserved. + .\" +@@ -41,9 +41,9 @@ + .\" + .\" $Id: master.8,v 1.13 2004/12/17 16:32:23 ken3 Exp $ + .SH NAME +-master \- master Cyrus process ++cyrmaster \- master Cyrus process + .SH SYNOPSIS +-.B master ++.B cyrmaster + [ + .B \-C + .I alternate imapd.conf +@@ -79,7 +79,7 @@ + .I snmp agentx socket + ] + .SH DESCRIPTION +-.I Master ++.I cyrmaster + is the process that controls all of the Cyrus processes. This process + is responsible for creating all imapd, pop3d, lmtpd and sieved child + processes. This process also initializes the Berkeley DB code and +@@ -92,12 +92,12 @@ + .SH OPTIONS + .TP + .BI \-C " alternate imapd.conf" +-Specifies an alternate imapd.conf for use by master (note that this will +-not affect any sub-processes spawned by master, you should specify those ++Specifies an alternate imapd.conf for use by cyrmaster (note that this will ++not affect any sub-processes spawned by cyrmaster, you should specify those + specifically in the respective entries in cyrus.conf). + .TP + .BI \-M " alternate cyrus.conf" +-Specifies an alternate cyrus.conf for use by master. ++Specifies an alternate cyrus.conf for use by cyrmaster. + .TP + .BI \-l " listen queue backlog" + Increase the listen queue backlog. By default, the listen queue is set +@@ -113,7 +113,7 @@ + .BI \-p " pidfile" + Use + .I pidfile +-as the pidfile. If not specified, defaults to /var/run/cyrus-master.pid ++as the pidfile. If not specified, defaults to /var/run/cyrmaster.pid + .TP + .BI \-P " snmp agentx ping interval" + Sets the amount on time in seconds the subagent will try and reconnect to the +@@ -132,12 +132,12 @@ + Requires net-snmp 5.0 or higher. + .SH CONFIGURATION + Upon execution, +-.I master ++.I cyrmaster + reads its configuration information out of the + .IR cyrus.conf (5) + file. + .PP +-.I Master ++.I cyrmaster + rereads its configuration file when it receives a hangup signal, + SIGHUP. Services and events may be added, deleted or modified when the + configuration file is reread. Any active services removed from the +@@ -146,9 +146,18 @@ + The environment variable \fBCYRUS_VERBOSE\fR can be set to log additional + debugging information. Setting the value to 1 results in base level logging. + Setting it higher results in more log messages being generated. ++.SH BUGS ++Services do not always go away silently when removed through a SIGHUP. If ++there are workers of the removed service still running, messages to syslog ++about broken pipes and accept() failures are to be expected. ++.PP ++The in-memory list of services is not cleaned up ever, so a cyrmaster daemon ++that has been sent an extremely high amount of SIGHUP signals to ++add/remove/modify services will lose performance eventually. Restarting ++cyrmaster fixes this. + .SH FILES + .TP +-.B /etc/cyrus.conf, /etc/imapd.conf, /var/run/cyrus-master.pid ++.B /etc/cyrus.conf, /etc/imapd.conf, /var/run/cyrmaster.pid + .SH SEE ALSO + .PP + \fBcyrus.conf(5)\fR, \fBimapd.conf(5)\fR, \fBimapd(8)\fR, +diff -urNad complete.dpatch/man/nntpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8 +--- complete.dpatch/man/nntpd.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8 2005-11-11 15:34:00.398958163 +0100 +@@ -74,7 +74,7 @@ + is a NNTP server. + It accepts commands on its standard input and responds on its standard output. + It MUST invoked by +-.IR master (8) ++.IR cyrmaster (8) + with those descriptors attached to a remote client connection. + .PP + .I Nntpd +@@ -142,4 +142,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/notifyd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8 +--- complete.dpatch/man/notifyd.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8 2005-11-11 15:34:00.398958163 +0100 +@@ -62,7 +62,7 @@ + ] + .SH DESCRIPTION + .B Notifyd +-is a daemon started from master(8) that handles notification requests on ++is a daemon started from cyrmaster(8) that handles notification requests on + behalf of lmtpd(8). + .B Notifyd + accepts the request and performs the notification using the method +@@ -122,4 +122,4 @@ + Cyrus Master process configuration file. + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrmaster(8)\fR, \fBlmtpd(8)\fR +diff -urNad complete.dpatch/man/pop3d.8 /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8 +--- complete.dpatch/man/pop3d.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8 2005-11-11 15:34:00.399958065 +0100 +@@ -71,7 +71,7 @@ + is a POP3 server. + It accepts commands on its standard input and responds on its standard output. + It MUST invoked by +-.IR master (8) ++.IR cyrmaster (8) + with those descriptors attached to a remote client connection. + .PP + .I Pop3d +@@ -121,4 +121,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/quota.8 /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8 +--- complete.dpatch/man/quota.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8 2005-11-11 15:34:00.399958065 +0100 +@@ -1,5 +1,5 @@ + .\" -*- nroff -*- +-.TH QUOTA 8 "Project Cyrus" CMU ++.TH CYRQUOTA 8 "Project Cyrus" CMU + .\" + .\" Copyright (c) 1998-2000 Carnegie Mellon University. All rights reserved. + .\" +@@ -41,9 +41,9 @@ + .\" + .\" $Id: quota.8,v 1.11 2003/10/22 18:50:13 rjs3 Exp $ + .SH NAME +-quota \- report and optionally fix quota usage ++cyrquota \- report and optionally fix quota usage + .SH SYNOPSIS +-.B quota ++.B cyrquota + [ + .B \-C + .I config-file +@@ -59,12 +59,12 @@ + .IR mailbox-prefix ... + ] + .SH DESCRIPTION +-.I Quota ++.I cyrquota + generates a report listing quota roots, giving their limits and usage. + If the + .I \-f + option is given, +-.I quota ++.I cyrquota + first fixes any inconsistencies in the quota subsystem, such as + mailboxes with the wrong quota root or quota roots with the wrong + quota usage reported. +@@ -79,14 +79,14 @@ + prefixes. + .PP + Running +-.I quota ++.I cyrquota + with both the + .I \-f + option and + .I mailbox-prefix + arguments is not recommended. + .PP +-.I Quota ++.I cyrquota + reads its configuration options out of the + .IR imapd.conf (5) + file unless specified otherwise by \fB-C\fR. +diff -urNad complete.dpatch/man/reconstruct.8 /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8 +--- complete.dpatch/man/reconstruct.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8 2005-11-11 15:34:00.399958065 +0100 +@@ -1,5 +1,5 @@ + .\" -*- nroff -*- +-.TH RECONSTRUCT 8 "Project Cyrus" CMU ++.TH CYRRECONSTRUCT 8 "Project Cyrus" CMU + .\" + .\" Copyright (c) 1998-2000 Carnegie Mellon University. All rights reserved. + .\" +@@ -41,9 +41,9 @@ + .\" + .\" $Id: reconstruct.8,v 1.19 2004/10/13 18:07:49 shadow Exp $ + .SH NAME +-reconstruct \- reconstruct mailboxes ++cyrreconstruct \- reconstruct mailboxes + .SH SYNOPSIS +-.B reconstruct ++.B cyrreconstruct + [ + .B \-C + .I config-file +@@ -63,14 +63,14 @@ + ] + .IR mailbox ... + .br +-.B reconstruct ++.B cyrreconstruct + [ + .B \-C + .I config-file + ] + .B \-m + .SH DESCRIPTION +-.I Reconstruct ++.I cyrreconstruct + rebuilds one or more IMAP mailboxes. When invoked with the + .B \-m + switch, it rebuilds the master +@@ -78,17 +78,17 @@ + almost any sort of data corruption. + .PP + If +-.I Reconstruct ++.I cyrreconstruct + can find existing header and index files, it attempts to preserve any + data in them that is not derivable from the message files themselves. + The state +-.I reconstruct ++.I cyrreconstruct + attempts to preserve includes the flag names, flag state, and + internaldate. +-.I Reconstruct ++.I cyrreconstruct + derives all other information from the message files. + .PP +-.I Reconstruct ++.I cyrreconstruct + reads its configuration options out of the + .IR imapd.conf (5) + file unless specified otherwise by \fB-C\fR. Any mailbox directory +@@ -96,12 +96,12 @@ + .I partition-news + configuration option is assumed to be in news format. + .PP +-.I Reconstruct ++.I cyrreconstruct + does not adjust the quota usage recorded in any quota + root files. After running +-.IR reconstruct , ++.IR cyrreconstruct , + it is advisable to run +-.IR quota (8) ++.IR cyrquota (8) + with the + .I \-f + switch in order to fix the quota root files. +diff -urNad complete.dpatch/man/smmapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8 +--- complete.dpatch/man/smmapd.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8 2005-11-11 15:34:00.400957968 +0100 +@@ -67,7 +67,7 @@ + It accepts commands on its standard input and responds on its standard + output. + It MUST be invoked by +-.IR master (8) ++.IR cyrmaster (8) + with those descriptors attached to a remote client connection. + .PP + .B SMMAPD +diff -urNad complete.dpatch/man/timsieved.8 /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8 +--- complete.dpatch/man/timsieved.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8 2005-11-11 15:34:00.400957968 +0100 +@@ -53,7 +53,7 @@ + is a server that allows users to remotly manage their sieve scripts kept on the server. + It accepts commands on its standard input and responds on its standard output. + It MUST be invoked by +-.IR master (8) ++.IR cyrmaster (8) + with those descriptors attached to a remote client connection. + .PP + .I Timsieved +@@ -70,4 +70,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/man/tls_prune.8 /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8 +--- complete.dpatch/man/tls_prune.8 2005-11-11 15:33:59.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8 2005-11-11 15:34:00.400957968 +0100 +@@ -67,4 +67,4 @@ + .B /etc/imapd.conf + .SH SEE ALSO + .PP +-\fBimapd.conf(5)\fR, \fBmaster(8)\fR ++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR +diff -urNad complete.dpatch/sieve/md5.c /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c +--- complete.dpatch/sieve/md5.c 2000-01-05 05:51:51.000000000 +0100 ++++ /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c 2005-11-11 15:34:48.633248090 +0100 +@@ -31,7 +31,7 @@ + + #include "md5global.h" + #include "md5.h" +-#include "hmac-md5.h" ++#include "sasl/hmac-md5.h" + + /* Constants for MD5Transform routine. + */ --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0002-allow_invalid_id_acl_removal.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0002-allow_invalid_id_acl_removal.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream: Allow removal of invalid ID ACLs + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c +--- cyrus-imapd-2.2.13/lib/acl_afs.c 2005-03-12 23:09:22.000000000 +0100 ++++ /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c 2006-05-03 15:27:47.049193574 +0200 +@@ -114,6 +114,7 @@ + cyrus_acl_canonproc_t *canonproc; + void *canonrock; + { ++ const char *canonid; + char *newidentifier = 0; + char *newacl; + char *thisid, *nextid; +@@ -122,9 +123,14 @@ + + /* Convert 'identifier' into canonical form */ + if (*identifier == '-') { +- char *canonid = auth_canonifyid(identifier+1, 0); ++ canonid = auth_canonifyid(identifier+1, 0); + if (!canonid) { +- return -1; ++ if (access != 0L) { ++ return -1; ++ } else { ++ /* trying to delete invalid/non-existent identifier */ ++ canonid = identifier+1; ++ } + } + newidentifier = xmalloc(strlen(canonid)+2); + newidentifier[0] = '-'; +@@ -135,9 +141,13 @@ + } + } + else { +- identifier = auth_canonifyid(identifier, 0); +- if (!identifier) { ++ canonid = auth_canonifyid(identifier, 0); ++ if (canonid) { ++ identifier = canonid; ++ } else if (access != 0L) { + return -1; ++ } else { ++ /* trying to delete invalid/non-existent identifier */ + } + if (canonproc) { + access = canonproc(canonrock, identifier, access); --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0016-upstream-fix-typos.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch @@ -0,0 +1,64 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## upstream-fix-typos by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream fix for some typos in manpages for reconstruct and chk_cyrus + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8 +--- cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:04:29.000000000 +0200 ++++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:08:15.026586061 +0200 +@@ -40,7 +40,7 @@ + .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + .\" + .SH NAME +-chk_cyrus \- perform a consistancy check of the cyrus mailstore ++chk_cyrus \- perform a consistency check of the cyrus mailstore + .SH SYNOPSIS + .B chk_cyrus + [ +@@ -57,7 +57,7 @@ + ] + .SH DESCRIPTION + .I Chk_cyrus +-is used to perform a consistancy check on the cyrus datastore, and output ++is used to perform a consistency check on the cyrus datastore, and output + a list of files/directories that are expected to exist, but do not. + Status messagess are output to stderr, the list of files/directories is + output to stdout. This list can be passed to a backup program to aid a +@@ -73,10 +73,10 @@ + Read configuration options from \fIconfig-file\fR. + .TP + .BI \-P " partition" +-Run the consistancy check for only the given partition. ++Run the consistency check for only the given partition. + May not be specified with -M. + .BI \-M " mailbox" +-Run the consistancy check for only the given mailbox. ++Run the consistency check for only the given mailbox. + May not be specified with -P. + .SH FILES + .TP +diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8 +--- cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:04:29.000000000 +0200 ++++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:10:35.754646314 +0200 +@@ -39,7 +39,7 @@ + .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + .\" +-.\" $Id: reconstruct.8,v 1.19 2004/10/13 18:07:49 shadow Exp $ ++.\" $Id: reconstruct.8,v 1.20 2006/06/19 13:01:19 murch Exp $ + .SH NAME + reconstruct \- reconstruct mailboxes + .SH SYNOPSIS +@@ -118,8 +118,8 @@ + .B \-x + When processing a mailbox which is not in the mailbox list (e.g. via + the -p or -f options), do not import the metadata from the mailbox, +-instead create it anew (this specifically affects atleast the mailbox's seen +-stat unique identifier, user flags, and ACL). ++instead create it anew (this specifically affects at least the mailbox's seen ++state unique identifier, user flags, and ACL). + .TP + .B \-r + Recursively reconstruct all sub-mailboxes of the mailboxes or mailbox --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/15-munge_8bit.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/15-munge_8bit.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_munge_8bit.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for munge8bit + +@DPATCH@ +diff -urNad complete.dpatch/imap/message.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c +--- complete.dpatch/imap/message.c 2004-09-16 19:58:54.000000000 +0200 ++++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c 2005-11-10 17:02:02.658034914 +0100 +@@ -227,6 +227,7 @@ + int n; + int sawcr = 0, sawnl; + int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); ++ int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); + int inheader = 1, blankline = 1; + + while (size) { +@@ -262,7 +263,7 @@ + /* We have been configured to reject all mail of this + form. */ + if (!r) r = IMAP_MESSAGE_CONTAINS8BIT; +- } else { ++ } else if (munge8bit) { + /* We have been configured to munge all mail of this + form. */ + *p = 'X'; +diff -urNad complete.dpatch/imap/spool.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c +--- complete.dpatch/imap/spool.c 2004-10-27 22:40:50.000000000 +0200 ++++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c 2005-11-10 17:02:02.658034914 +0100 +@@ -140,6 +140,7 @@ + state s = NAME_START; + int r = 0; + int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); ++ int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); + const char **skip = NULL; + + if (namelen == 0) { +@@ -266,7 +267,7 @@ + form. */ + r = IMAP_MESSAGE_CONTAINS8BIT; + goto ph_error; +- } else { ++ } else if (munge8bit) { + /* We have been configured to munge all mail of this + form. */ + c = 'X'; +diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions +--- complete.dpatch/lib/imapoptions 2004-07-21 21:07:45.000000000 +0200 ++++ /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions 2005-11-10 17:02:02.659034816 +0100 +@@ -458,6 +458,11 @@ + { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")} + /* The cyrusdb backend to use for the mailbox list. */ + ++{ "munge8bit", 1, SWITCH } ++/* If enabled, lmtpd changes 8-bit characters to `X'. Also see reject8bit. ++ (A proper soultion to non-ASCII characters in headers is offered by ++ RFC 2047 and its predecessors.) */ ++ + # xxx badly worded + { "mupdate_connections_max", 128, INT } + /* The max number of connections that a mupdate process will allow, this +@@ -670,9 +675,9 @@ + + { "reject8bit", 0, SWITCH } + /* If enabled, lmtpd rejects messages with 8-bit characters in the +- headers. Otherwise, 8-bit characters are changed to `X'. (A +- proper soultion to non-ASCII characters in headers is offered by +- RFC 2047 and its predecessors.) */ ++ headers. Also see munge8bit, which is only applied if reject8bit is ++ not activated. (A proper soultion to non-ASCII characters in headers ++ is offered by RFC 2047 and its predecessors.) */ + + { "rfc2046_strict", 0, SWITCH } + /* If enabled, imapd will be strict (per RFC 2046) when matching MIME --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/08-clean_socket_closes.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/08-clean_socket_closes.dpatch @@ -0,0 +1,90 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08-clean_socket_closes.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleanly close sockets + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c +--- cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:20:40.000000000 +0200 ++++ /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:22:01.565116257 +0200 +@@ -400,6 +400,7 @@ + syslog(LOG_ERR, "couldn't authenticate to backend server: %s", + sasl_errstring(r, NULL, NULL)); + if (!ret_backend) free(ret); ++ shutdown(sock, SHUT_RDWR); + close(sock); + ret = NULL; + } +diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c +--- complete.dpatch/imap/fud.c 2005-11-10 21:12:04.000000000 +0100 ++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c 2005-11-11 00:01:58.076164940 +0100 +@@ -158,6 +158,15 @@ + mboxlist_done(); + closelog(); + cyrus_done(); ++ ++ /* be nice to remote */ ++ shutdown(0, SHUT_RD); ++ shutdown(1, SHUT_RD); ++ shutdown(2, SHUT_RD); ++ close(0); ++ close(1); ++ close(2); ++ + exit(code); + } + +diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c +--- complete.dpatch/imap/imapd.c 2005-11-10 21:12:04.000000000 +0100 ++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c 2005-11-11 00:04:47.146591300 +0100 +@@ -767,6 +767,10 @@ + #ifdef HAVE_SSL + tls_shutdown_serverengine(); + #endif ++ /* shutdown socket nicely */ ++ cyrus_close_sock(0); ++ cyrus_close_sock(1); ++ cyrus_close_sock(2); + + cyrus_done(); + +diff -urNad complete.dpatch/imap/lmtpd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c +--- complete.dpatch/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100 ++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c 2005-11-11 00:02:48.172254190 +0100 +@@ -553,6 +553,9 @@ + + cyrus_done(); + ++ /* shutdown socket nicely */ ++ cyrus_reset_stdio(); ++ + exit(code); + } + +diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c +--- complete.dpatch/imap/pop3d.c 2005-11-10 21:07:23.000000000 +0100 ++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c 2005-11-11 00:03:22.702869236 +0100 +@@ -496,6 +496,9 @@ + #endif + + cyrus_done(); ++ cyrus_close_sock(0); ++ cyrus_close_sock(1); ++ cyrus_close_sock(2); + + exit(code); + } +diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c +--- complete.dpatch/imap/proxyd.c 2005-11-10 21:12:04.000000000 +0100 ++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c 2005-11-11 00:04:04.761746266 +0100 +@@ -1382,6 +1382,9 @@ + #endif + + cyrus_done(); ++ cyrus_close_sock(0); ++ cyrus_close_sock(1); ++ cyrus_close_sock(2); + + exit(code); + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/06-disable_runpath.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/06-disable_runpath.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06-disable_runpath.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: disable runpath + +@DPATCH@ +diff -urNad complete.dpatch/cmulocal/cyrus.m4 /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4 +--- complete.dpatch/cmulocal/cyrus.m4 2003-10-08 22:35:24.000000000 +0200 ++++ /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4 2005-11-10 18:33:44.832750394 +0100 +@@ -3,6 +3,7 @@ + dnl $Id: cyrus.m4,v 1.4 2003/10/08 20:35:24 rjs3 Exp $ + dnl tjs@andrew.cmu.edu 6-may-1998 + dnl ++dnl Debian fix (hmh@debian.org): We don't want runpath set in Debian + + dnl It would be good if ANDREW_ADD_LIBPATH could detect if something was + dnl already there and not redundantly add it if it is. +@@ -30,16 +31,8 @@ + ]) + + dnl runpath initialization ++dnl (disabled by hmh@debian.org + AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [ + # CMU GUESS RUNPATH SWITCH +- AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [ +- # first, try -R +- SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-R /usr/lib" +- AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [ +- LDFLAGS="-Wl,-rpath,/usr/lib" +- AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"], +- [andrew_runpath_switch="none"]) +- ]) +- LDFLAGS="${SAVE_LDFLAGS}" +- ])]) ++ andrew_runpath_switch="none" ++]) --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0090-fix-casts.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0090-fix-casts.dpatch @@ -0,0 +1,123 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0090-fix-casts.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compile-time warnings about casts from pointer to integer +## DP: of different size. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c +--- ./imap/squat_build.c 2006-04-25 17:28:58.000000000 +0200 ++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c 2006-06-08 14:33:06.966146056 +0200 +@@ -479,7 +479,7 @@ + for (i = 0; i < VECTOR_SIZE(t->entries); i++) { + SquatWordTableEntry* e = &(t->entries[i]); + +- if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) { ++ if (e->leaf_presence != NULL && ((int)e->leaf_presence_singleton & 1) == 0) { + free(e->leaf_presence); + } + } +@@ -568,7 +568,7 @@ + + if (word_entry == NULL) { + /* We are in "per document" mode. */ +- if (((int)e->leaf_presence & 1) != 0) { ++ if (((int)e->leaf_presence_singleton & 1) != 0) { + /* We currently have a singleton here. */ + int oldch = e->leaf_presence_singleton >> 1; + +@@ -787,7 +787,7 @@ + + word[0] = (char)i; + +- if (((int)e->leaf_presence & 1) != 0) { ++ if (((int)e->leaf_presence_singleton & 1) != 0) { + /* Got a singleton at this branch point. Just output the single word. */ + word[1] = (char)(e->leaf_presence_singleton >> 1); + e->leaf_presence = NULL; /* clear the leaf out */ +diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c +--- ./imap/tls.c 2006-04-25 17:28:58.000000000 +0200 ++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c 2006-06-08 14:28:13.259629963 +0200 +@@ -717,14 +717,22 @@ + return (ret); + + if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) { +- printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))", +- (unsigned int) bio, (long unsigned int) argp, ++#if __WORDSIZE == 64 ++ printf("read from %016zX [%016zX] (%d bytes => %ld (0x%X))", ++#else ++ printf("read from %08zX [%08zX] (%d bytes => %ld (0x%X))", ++#endif ++ (size_t) bio, (size_t) argp, + argi, ret, (unsigned int) ret); + tls_dump(argp, (int) ret); + return (ret); + } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) { +- printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))", +- (unsigned int) bio, (long unsigned int)argp, ++#if __WORDSIZE == 64 ++ printf("write to %016zX [%016zX] (%d bytes => %ld (0x%X))", ++#else ++ printf("write to %08zX [%08zX] (%d bytes => %ld (0x%X))", ++#endif ++ (size_t) bio, (size_t)argp, + argi, ret, (unsigned int) ret); + tls_dump(argp, (int) ret); + } +diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c +--- ./master/master.c 2006-04-25 17:28:58.000000000 +0200 ++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c 2006-06-08 14:28:13.259629963 +0200 +@@ -1304,7 +1304,6 @@ + + void add_service(const char *name, struct entry *e, void *rock) + { +- int ignore_err = (int) rock; + char *cmd = xstrdup(masterconf_getstring(e, "cmd", "")); + int prefork = masterconf_getint(e, "prefork", 0); + int babysit = masterconf_getswitch(e, "babysit", 0); +@@ -1324,7 +1323,7 @@ + snprintf(buf, sizeof(buf), + "unable to find command or port for service '%s'", name); + +- if (ignore_err) { ++ if (rock != NULL) { + syslog(LOG_WARNING, "WARNING: %s -- ignored", buf); + return; + } +@@ -1340,7 +1339,7 @@ + /* must have empty/same service name, listen and proto */ + if ((!Services[i].name || !strcmp(Services[i].name, name)) && + (!Services[i].listen || !strcmp(Services[i].listen, listen)) && +- (!Services[i].proto || !strcmp(Services[i].proto, proto))) ++ ((Services[i].proto==NULL) || !strcmp(Services[i].proto, proto))) + break; + } + +@@ -1349,7 +1348,7 @@ + char buf[256]; + snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name); + +- if (ignore_err) { ++ if (rock != NULL) { + syslog(LOG_WARNING, "WARNING: %s -- ignored", buf); + return; + } +@@ -1438,7 +1437,6 @@ + + void add_event(const char *name, struct entry *e, void *rock) + { +- int ignore_err = (int) rock; + char *cmd = xstrdup(masterconf_getstring(e, "cmd", "")); + int period = 60 * masterconf_getint(e, "period", 0); + int at = masterconf_getint(e, "at", -1), hour, min; +@@ -1450,7 +1448,7 @@ + snprintf(buf, sizeof(buf), + "unable to find command or port for event '%s'", name); + +- if (ignore_err) { ++ if (rock != NULL) { + syslog(LOG_WARNING, "WARNING: %s -- ignored", buf); + return; + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/60-lower-poptimeout-minimum.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/60-lower-poptimeout-minimum.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40-lower-poptimeout-minimum.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Lower the minimum timeout for POP3 locks +## DP: NOTE: Though this patch enables you to lower POP3 lock timeouts to +## DP: less than 10 minutes, the corresponding RFC REQUIRES that the timeout +## DP: is not shorter than 10 minutes. You may run into problems if you set +## DP: Timeouts below that value. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c +--- cyrus-imapd-2.2.12/imap/pop3d.c 2005-05-25 00:07:42.000000000 +0200 ++++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c 2005-07-15 16:53:38.168045663 +0200 +@@ -402,7 +402,7 @@ + + /* Set inactivity timer */ + timeout = config_getint(IMAPOPT_POPTIMEOUT); +- if (timeout < 10) timeout = 10; ++ if (timeout < 1) timeout = 1; + prot_settimeout(popd_in, timeout*60); + prot_setflushonread(popd_in, popd_out); + +diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions +--- cyrus-imapd-2.2.12/lib/imapoptions 2005-05-25 00:07:42.000000000 +0200 ++++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions 2005-07-15 16:57:59.646502208 +0200 +@@ -601,7 +601,9 @@ + + { "poptimeout", 10, INT } + /* Set the length of the POP server's inactivity autologout timer, +- in minutes. The minimum value is 10, the default. */ ++ in minutes. The minimum value is 1, the default is 10. ++ NOTE: The standard (RFC1939) specifically states that this ++ value MUST NOT be lower than 10.*/ + + { "popuseacl", 0, SWITCH } + /* Enforce IMAP ACLs in the pop server. Due to the nature of the POP3 --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/10-fix_potential_overflows.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/10-fix_potential_overflows.dpatch @@ -0,0 +1,198 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-fix_potential_overflows.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix potential buffer overflows + +@DPATCH@ +diff -urNad complete.dpatch/imap/ctl_mboxlist.c /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c +--- complete.dpatch/imap/ctl_mboxlist.c 2004-05-22 05:45:48.000000000 +0200 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c 2005-11-10 20:38:08.142040412 +0100 +@@ -479,7 +479,7 @@ + int r = 0; + char buf[16384]; + int line = 0; +- char last_commit[MAX_MAILBOX_NAME]; ++ char last_commit[MAX_MAILBOX_NAME+1]; + char *key=NULL, *data=NULL; + int keylen, datalen; + int untilCommit = PER_COMMIT; +diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c +--- complete.dpatch/imap/fud.c 2004-12-17 17:32:07.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c 2005-11-10 20:38:44.863358638 +0100 +@@ -119,9 +119,9 @@ + + while(1) { + /* For safety */ +- memset(username,'\0',MAXLOGNAME + MAXDOMNAME); +- memset(mbox,'\0',MAX_MAILBOX_NAME+1); +- memset(buf, '\0', MAXLOGNAME + MAX_MAILBOX_NAME + 1); ++ memset(username,'\0', sizeof(username)); ++ memset(mbox,'\0', sizeof(mbox)); ++ memset(buf, '\0', sizeof(buf)); + + if (signals_poll() == SIGHUP) { + /* caught a SIGHUP, return */ +diff -urNad complete.dpatch/imap/global.c /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c +--- complete.dpatch/imap/global.c 2004-11-23 18:40:15.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c 2005-11-10 20:40:02.897537018 +0100 +@@ -467,7 +467,7 @@ + { + struct namespace namespace; + char *acl; +- char bufuser[MAX_MAILBOX_NAME], inboxname[MAX_MAILBOX_NAME]; ++ char bufuser[MAX_MAILBOX_NAME+1], inboxname[MAX_MAILBOX_NAME+1]; + int r; + + /* Set namespace */ +diff -urNad complete.dpatch/imap/idle_idled.c /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c +--- complete.dpatch/imap/idle_idled.c 2003-10-22 22:05:11.000000000 +0200 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c 2005-11-10 20:40:56.266272619 +0100 +@@ -109,11 +109,11 @@ + idle_remote.sun_family = AF_UNIX; + idle_sock = config_getstring(IMAPOPT_IDLESOCKET); + if (idle_sock) { +- strcpy(idle_remote.sun_path, idle_sock); ++ strlcpy(idle_remote.sun_path, idle_sock, sizeof(idle_remote.sun_path)); + } + else { +- strcpy(idle_remote.sun_path, config_dir); +- strcat(idle_remote.sun_path, FNAME_IDLE_SOCK); ++ strlcpy(idle_remote.sun_path, config_dir, sizeof(idle_remote.sun_path)); ++ strlcat(idle_remote.sun_path, FNAME_IDLE_SOCK, sizeof(idle_remote.sun_path)); + } + idle_remote_len = sizeof(idle_remote.sun_family) + + strlen(idle_remote.sun_path) + 1; +diff -urNad complete.dpatch/imap/index.c /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c +--- complete.dpatch/imap/index.c 2005-02-14 17:42:08.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c 2005-11-10 20:42:49.720157772 +0100 +@@ -3278,9 +3278,17 @@ + cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP); + break; + case SORT_SUBJECT: +- cur->xsubj = index_extract_subject(subj + CACHE_ITEM_SIZE_SKIP, +- CACHE_ITEM_LEN(subj), +- &cur->is_refwd); ++ { ++ int len = CACHE_ITEM_LEN(subj); ++ char *t = xmalloc(len+1); ++ ++ memcpy(t, subj + CACHE_ITEM_SIZE_SKIP, len); ++ t[len] = '\0'; ++ ++ cur->xsubj = index_extract_subject(t, len, &cur->is_refwd); ++ ++ free(t); ++ } + cur->xsubj_hash = strhash(cur->xsubj); + break; + case SORT_TO: +diff -urNad complete.dpatch/imap/mboxlist.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h +--- complete.dpatch/imap/mboxlist.h 2004-03-17 19:07:49.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h 2005-11-10 20:43:33.110906719 +0100 +@@ -73,7 +73,7 @@ + + /* each mailbox has the following data */ + struct mbox_entry { +- char name[MAX_MAILBOX_NAME]; ++ char name[MAX_MAILBOX_NAME+1]; + int mbtype; + char partition[MAX_PARTITION_LEN]; + /* holds remote machine for REMOTE mailboxes */ +diff -urNad complete.dpatch/imap/message.c /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c +--- complete.dpatch/imap/message.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c 2005-11-10 20:44:17.400567516 +0100 +@@ -795,7 +795,7 @@ + /* Save header value */ + len = hdrend - hdr; + message_ibuf_ensure(ibuf, len+2); +- strncpy(ibuf->end, hdr, len); ++ strncpy(ibuf->end, hdr, len+1); + ibuf->end += len; + *(ibuf->end)++ = '\r'; + *(ibuf->end)++ = '\n'; +diff -urNad complete.dpatch/imap/mupdate.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h +--- complete.dpatch/imap/mupdate.h 2003-12-10 17:07:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h 2005-11-10 20:44:52.257152442 +0100 +@@ -70,8 +70,8 @@ + struct buf tag, cmd, arg1, arg2, arg3; + + /* For client side mupdate_find calls */ +- char mailbox_buf[MAX_MAILBOX_NAME]; +- char server_buf[MAX_MAILBOX_NAME]; ++ char mailbox_buf[MAX_MAILBOX_NAME+1]; ++ char server_buf[MAX_MAILBOX_NAME+1]; + char *acl_buf; + size_t acl_buf_len; + struct mupdate_mailboxdata mailboxdata_buf; +diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c +--- complete.dpatch/imap/proxyd.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c 2005-11-10 20:46:06.823846583 +0100 +@@ -1277,7 +1277,7 @@ + char **envp __attribute__((unused))) + { + socklen_t salen; +- char hbuf[NI_MAXHOST]; ++ char hbuf[NI_MAXHOST+1]; + struct sockaddr_storage proxyd_localaddr, proxyd_remoteaddr; + char localip[60], remoteip[60]; + int niflags; +diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c +--- complete.dpatch/imtest/imtest.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c 2005-11-10 20:47:18.417831766 +0100 +@@ -1225,7 +1225,7 @@ + + /* can't have this and a file for input */ + sunsock.sun_family = AF_UNIX; +- strcpy(sunsock.sun_path, output_socket); ++ strlcpy(sunsock.sun_path, output_socket, sizeof(sunsock.sun_path)); + unlink(output_socket); + + listen_sock = socket(AF_UNIX, SOCK_STREAM, 0); +diff -urNad complete.dpatch/master/master.c /tmp/dpep.8ZEecd/complete.dpatch/master/master.c +--- complete.dpatch/master/master.c 2005-11-10 18:19:03.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/master/master.c 2005-11-10 20:50:59.813138032 +0100 +@@ -222,13 +222,17 @@ + return result; + } + +-void get_prog(char *path, unsigned size, char *const *cmd) ++void get_prog(char *path, unsigned int size, char *const *cmd) + { + if (cmd[0][0] == '/') { + /* master lacks strlcpy, due to no libcyrus */ + snprintf(path, size, "%s", cmd[0]); ++ path[size-1] = '\0'; ++ } ++ else { ++ snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]); ++ path[size-1] = '\0'; + } +- else snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]); + } + + void get_statsock(int filedes[2]) +diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c +--- complete.dpatch/master/masterconf.c 2003-11-25 18:37:19.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c 2005-11-10 20:53:17.940602394 +0100 +@@ -133,7 +133,7 @@ + } else { + /* one word */ + for (i = 0; i < 255; i++) { +- if (isspace((int) *p)) break; ++ if ((!*p) || (isspace((int) *p))) break; + v[i] = *p++; + } + } +diff -urNad complete.dpatch/notifyd/notifyd.c /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c +--- complete.dpatch/notifyd/notifyd.c 2004-12-17 17:32:25.000000000 +0100 ++++ /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c 2005-11-10 20:55:15.058125035 +0100 +@@ -143,7 +143,7 @@ + if (cp) nopt = strtol(cp, NULL, 10); + if (nopt < 0 || errno == ERANGE) cp = NULL; + +- if (cp && nopt && ++ if (cp && (nopt > 0) && + !(options = (char**) xrealloc(options, nopt * sizeof(char*)))) { + fatal("xmalloc(): can't allocate options", EC_OSERR); + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/45-kolab2-annotations.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/45-kolab2-annotations.dpatch @@ -0,0 +1,155 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 45-kolab2-annotations.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add kolab2 compatible annotation functionality + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/annotate.c /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/imap/annotate.c +--- cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:43.000000000 +0200 ++++ /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:53.973964626 +0200 +@@ -1673,6 +1673,11 @@ + { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL } + }; + ++const struct annotate_st_entry vendor_entry = ++ { NULL, ATTRIB_TYPE_STRING, BACKEND_ONLY, ++ ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV, ++ ACL_ADMIN, annotation_set_todb, NULL }; ++ + int annotatemore_store(char *mailbox, + struct entryattlist *l, + struct namespace *namespace, +@@ -1685,6 +1690,7 @@ + struct attvaluelist *av; + struct storedata sdata; + const struct annotate_st_entry *entries; ++ struct annotate_st_entry * working_entry; + time_t now = time(0); + + memset(&sdata, 0, sizeof(struct storedata)); +@@ -1706,37 +1712,55 @@ + while (e) { + int entrycount, attribs; + struct annotate_st_entry_list *nentry = NULL; ++ struct annotate_st_entry *ientry = NULL; + + /* See if we support this entry */ ++ working_entry = NULL; + for (entrycount = 0; + entries[entrycount].name; + entrycount++) { + if (!strcmp(e->entry, entries[entrycount].name)) { ++ working_entry = &(entries[entrycount]); + break; + } + } +- if (!entries[entrycount].name) { +- /* unknown annotation */ +- return IMAP_PERMISSION_DENIED; ++ if (working_entry==NULL) { ++ /* test for generic vendor annotation */ ++ if ((strncmp("/vendor/", e->entry, strlen("/vendor/"))==0) && ++ (strlen(e->entry)>strlen("/vendor/"))) { ++ working_entry = &(vendor_entry); ++ } ++ else { ++ /* unknown annotation */ ++ return IMAP_PERMISSION_DENIED; ++ } + } + + /* Add this entry to our list only if it + applies to our particular server type */ +- if (entries[entrycount].proxytype == PROXY_AND_BACKEND ++ if (working_entry->proxytype == PROXY_AND_BACKEND + || (proxy_store_func && +- entries[entrycount].proxytype == PROXY_ONLY) ++ working_entry->proxytype == PROXY_ONLY) + || (!proxy_store_func && +- entries[entrycount].proxytype == BACKEND_ONLY)) { ++ working_entry->proxytype == BACKEND_ONLY)) { ++ ientry = xzmalloc(sizeof(struct annotate_st_entry)); ++ ientry->name = e->entry; ++ ientry->type = working_entry->type; ++ ientry->proxytype = working_entry->proxytype; ++ ientry->attribs = working_entry->attribs; ++ ientry->acl = working_entry->acl; ++ ientry->set = working_entry->set; ++ ientry->rock = working_entry->rock; + nentry = xzmalloc(sizeof(struct annotate_st_entry_list)); + nentry->next = sdata.entry_list; +- nentry->entry = &(entries[entrycount]); ++ nentry->entry = ientry; + nentry->shared.modifiedsince = now; + nentry->priv.modifiedsince = now; + sdata.entry_list = nentry; + } + + /* See if we are allowed to set the given attributes. */ +- attribs = entries[entrycount].attribs; ++ attribs = working_entry->attribs; + av = e->attvalues; + while (av) { + const char *value; +@@ -1746,7 +1770,7 @@ + goto cleanup; + } + value = annotate_canon_value(av->value, +- entries[entrycount].type); ++ working_entry->type); + if (!value) { + r = IMAP_ANNOTATION_BADVALUE; + goto cleanup; +@@ -1772,7 +1796,7 @@ + goto cleanup; + } + value = annotate_canon_value(av->value, +- entries[entrycount].type); ++ working_entry->type); + if (!value) { + r = IMAP_ANNOTATION_BADVALUE; + goto cleanup; +@@ -1874,6 +1898,12 @@ + /* Free the entry list */ + while (sdata.entry_list) { + struct annotate_st_entry_list *freeme = sdata.entry_list; ++ if (freeme != NULL){ ++ struct annotate_st_entry *freeme2 = freeme->entry; ++ if (freeme2 != NULL) { ++ free( freeme2 ); ++ } ++ } + sdata.entry_list = sdata.entry_list->next; + free(freeme); + } +diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm +--- cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-25 20:41:19.000000000 +0200 ++++ /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-26 21:34:36.112138623 +0200 +@@ -784,19 +784,21 @@ + "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail", + "expire" => "/vendor/cmu/cyrus-imapd/expire", + "sieve" => "/vendor/cmu/cyrus-imapd/sieve", +- "squat" => "/vendor/cmu/cyrus-imapd/squat" ); ++ "squat" => "/vendor/cmu/cyrus-imapd/squat", ++ "folder-type" => "/vendor/kolab/folder-type", ++ "h-share-uid" => "/vendor/kolab/h-share-uid" ); + + if(!$self->{support_annotatemore}) { + $self->{error} = "Remote does not support ANNOTATEMORE."; + return undef; + } + +- if(!exists($values{$entry})) { +- $self->{error} = "Unknown parameter $entry"; ++ if(exists($values{$entry})) { ++ $entry = $values{$entry}; ++ } else { ++ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/"; + } + +- $entry = $values{$entry}; +- + my ($rc, $msg); + + $value = undef if($value eq "none"); --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/21-fix_config-parsing.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/21-fix_config-parsing.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 21-fix_config-parsing.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix parsing of master.conf + +@DPATCH@ +diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c +--- complete.dpatch/master/masterconf.c 2005-11-11 15:25:37.000000000 +0100 ++++ /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c 2005-11-11 15:27:02.084797577 +0100 +@@ -150,8 +150,13 @@ + const char *val = masterconf_getstring(e, key, NULL); + + if (!val) return def; +- if (!isdigit((int) *val) && +- (*val != '-' || !isdigit((int) val[1]))) return def; ++ if (!isdigit((int) *val) && ++ (*val != '-' || !isdigit((int) val[1]))) { ++ syslog(LOG_DEBUG, "value '%s' for '%s' does not look like a number.", ++ val, key); ++ return def; ++ } ++ + return atoi(val); + } + +@@ -169,6 +174,10 @@ + (val[0] == 'o' && val[1] == 'n') || val[0] == 't') { + return 1; + } ++ ++ syslog(LOG_DEBUG, "cannot interpret value '%s' for key '%s'. use y/n.", ++ val, key); ++ + return def; + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/35-masssievec_remove_unused_variable.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_masssievec_remove_unused_variable.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove the $nosievedir variable which is set once but never used. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec +--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:52:49.000000000 +0200 ++++ /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:53:24.124865338 +0200 +@@ -86,7 +86,6 @@ + push @configs, $1; + } + if (/^sieveusehomedir:\s+(1|t|yes|on)/) { +- $nosievedir = 1; + print "you are storing sieve scripts in user's home directories, this script cannot deal with that\n"; + exit; + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/99-update-autoconf.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/99-update-autoconf.dpatch @@ -0,0 +1,25342 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99-update-autoconf.dpatch by Ondrej Sury +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Update configure and config.h.in according to changes in other patches +## DP: (64bit-quota and potentially DRAC) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13~/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 . +-# The master version of this file is at the FSF in /home/gd/gnu/lib. +-# Please send patches to . ++ ++# Originally written by Per Bothner . ++# Please send patches to . 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 ." ++ ++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@noc.rutgers.edu 8/24/94.) ++# (ghazi@noc.rutgers.edu 1994-08-24) + if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH + fi + + UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown + UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_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 <$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@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -175,25 +312,32 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -202,12 +346,12 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) +- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) +@@ -217,19 +361,13 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; +- atari*:NetBSD:*:*) +- echo m68k-atari-netbsd${UNAME_RELEASE} +- exit 0 ;; +- atari*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not +- # "atarist" or "atariste" at least should have a processor ++ # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not +@@ -237,61 +375,45 @@ + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; +- sun3*:NetBSD:*:*) +- echo m68k-sun-netbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:NetBSD:*:*) +- echo m68k-apple-netbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; +- macppc:NetBSD:*:*) +- echo powerpc-apple-netbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __cplusplus ++#include /* for printf() prototype */ + int main (int argc, char *argv[]) { + #else + int main (argc, argv) int argc; char *argv[]; { +@@ -310,28 +432,37 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy \ +- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] +@@ -343,31 +474,40 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' +- i?86:AIX:*:*) ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then ++ eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + +@@ -379,18 +519,21 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:4) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` +- if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then ++ exit ;; ++ *:AIX:*:[45]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc +@@ -398,37 +541,56 @@ + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else +- IBM_REV=4.${UNAME_RELEASE} ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; +- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) +- sed 's/^ //' << EOF >$dummy.c ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE + #include + #include + +@@ -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 + 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 < +-#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/^ //' <$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 </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 < +-#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 ++ #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' /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 ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says + echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green@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 < +@@ -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 ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif + #endif + + #if defined (alliant) && defined (i860) +@@ -1083,12 +1418,12 @@ + } + EOF + +-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +-rm -f $dummy.c $dummy ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1097,25 +1432,69 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +-#echo '(Unable to guess system type)' 1>&2 ++cat >&2 < 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 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 @@ + /* Build in PTS support? */ + #undef WITH_PTS + ++/* Define to 1 if your processor stores words with the most significant byte ++ first (like Motorola and SPARC, unlike Intel and VAX). */ ++#undef WORDS_BIGENDIAN ++ + /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ + #undef YYTEXT_POINTER +@@ -496,7 +510,11 @@ + SQUAT_ENGINE = 1, + + /* should we have long LMTP error messages? */ +- LMTP_LONG_ERROR_MSGS = 1 ++ LMTP_LONG_ERROR_MSGS = 1, ++ ++ /* default time to wait, in seconds, before giving up ++ * trying to lock something */ ++ LOCK_GIVEUP_TIMER_DEFAULT = 100 + }; + + #endif /* _CYRUS_IMAPD_CONFIG_H_ */ +diff -urNad cyrus-imapd-2.2.13~/config.sub 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 . 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 ." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; + esac + + # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- linux-gnu*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -94,7 +148,7 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple) ++ -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; +@@ -108,9 +162,21 @@ + os=-vxworks + basic_machine=$1 + ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -127,6 +193,10 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -166,27 +236,73 @@ + case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. +- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ +- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ +- | 580 | i960 | h8300 \ +- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ +- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ +- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ +- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ +- | mips64orion | mips64orionel | mipstx39 | mipstx39el \ +- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ +- | mips64vr5000 | miprs64vr5000el | mcore \ +- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ +- | thumb | d10v | fr30) ++ 1750a | 580 \ ++ | a29k \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64vr | mips64vrel \ ++ | mips64orion | mips64orionel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | mt \ ++ | msp430 \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | pyramid \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k) + basic_machine=$basic_machine-unknown + ;; +- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) ++ m6811 | m68hc11 | m6812 | m68hc12) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +- i[34567]86) ++ i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. +@@ -195,24 +311,66 @@ + exit 1 + ;; + # Recognize the basic CPU types with company name. +- # FIXME: clean up the formatting here. +- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ +- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ +- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ +- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ +- | xmp-* | ymp-* \ +- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ +- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ +- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ +- | clipper-* | orion-* \ +- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ +- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ +- | mips64el-* | mips64orion-* | mips64orionel-* \ +- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ +- | mipstx39-* | mipstx39el-* | mcore-* \ +- | f301-* | armv*-* | t3e-* \ +- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ +- | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tron-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa-* \ ++ | ymp-* \ ++ | z8k-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -230,6 +388,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + 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 +@@ -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. + # +-# Copyright (C) 2003 Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -16,11 +17,35 @@ + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 + DUALCASE=1; export DUALCASE # for MKS sh + ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +@@ -29,8 +54,43 @@ + fi + + ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ + # Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done + PS1='$ ' + PS2='> ' + PS4='+ ' +@@ -44,18 +104,19 @@ + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else +- $as_unset $as_var ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi + done + + # Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false +@@ -63,157 +124,386 @@ + + + # Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# CDPATH. ++$as_unset CDPATH + +-# PATH needs CR, and LINENO needs CR and PATH. +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no + fi + ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi + +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in ++ case $as_dir in + /*) +- if ("$as_dir/$as_base" -c ' ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # Try only shells that exist, to save several forks. ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { ("$as_shell") 2> /dev/null <<\_ASEOF ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( + as_lineno_1=$LINENO + as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || ++ chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + + +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- else +- as_ln_s='ln -s' +- fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +@@ -222,7 +512,19 @@ + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++# Find out whether ``test -x'' works. Don't use a zero-byte file, as ++# systems may use methods other than mode bits to determine executability. ++cat >conf$$.file <<_ASEOF ++#! /bin/sh ++exit 0 ++_ASEOF ++chmod +x conf$$.file ++if test -x conf$$.file >/dev/null 2>&1; then ++ as_executable_p="test -x" ++else ++ as_executable_p=: ++fi ++rm -f conf$$.file + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -231,39 +533,27 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH + ++exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +-exec 6>&1 +- + # + # Initializations. + # + ac_default_prefix=/usr/local ++ac_clean_files= + ac_config_libobj_dir=. ++LIBOBJS= + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} + +-# Maximum number of lines to put in a shell here document. +-# This variable seems obsolete. It should probably be removed, and +-# only ac_max_sed_lines should be used. +-: ${ac_max_here_lines=38} +- + # Identity of this package. + PACKAGE_NAME= + PACKAGE_TARNAME= +@@ -275,42 +565,179 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # 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 + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include +-#else +-# if HAVE_STDINT_H +-# include +-# endif + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' ++ac_subst_vars='SHELL ++PATH_SEPARATOR ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias ++host_alias ++target_alias ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++WARNERROR ++MAKEDEPEND ++cyrus_prefix ++service_path ++cyrus_user ++cyrus_group ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++RANLIB ++SET_MAKE ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++CPP ++GREP ++EGREP ++AWK ++LIBOBJS ++LIB_SOCKET ++IPV6_OBJS ++PRE_SUBDIRS ++EXTRA_SUBDIRS ++DEPLIBS ++LOCALDEFS ++BDB_INC ++BDB_LIB ++CYRUSDB_OBJS ++SIEVE_OBJS ++SIEVE_LIBS ++SIEVE_CPPFLAGS ++YACC ++YFLAGS ++LEX ++LEX_OUTPUT_ROOT ++LEXLIB ++SIEVE_SUBDIRS ++WITH_NONBLOCK ++WITH_GMTOFF ++WITH_MAP ++WITH_LOCK ++cyrus_sigveclib ++AFS_LIBS ++AFS_LDFLAGS ++LDAP_CPPFLAGS ++LDAP_LDFLAGS ++LDAP_LIBS ++SERVER_SUBDIRS ++OPENSSL_INC ++OPENSSL_LIB ++ZEPHYR_LIBS ++ZEPHYR_CPPFLAGS ++WITH_IDLE ++IMAP_PROGS ++COMPILE_ET ++COM_ERR_LIBS ++COM_ERR_LDFLAGS ++COM_ERR_CPPFLAGS ++LIB_CRYPT ++GSSAPI_LIBS ++GSSAPIBASE_LIBS ++LIB_DYN_SASL ++DYNSASLFLAGS ++LIB_SASL ++SASLFLAGS ++PERL ++PERL_CCCDLFLAGS ++MD5OBJ ++SNMP_SUBDIRS ++CMU_LIB_SUBDIR ++LIB_WRAP ++SNMP_CONFIG ++LIB_UCDSNMP ++LIB_RT ++IMAP_COM_ERR_LIBS ++IMAP_LIBS ++PERL_SUBDIRS ++PERL_DEPSUBDIRS ++LTLIBOBJS' + ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++CPP ++YACC ++YFLAGS' ++ + + # Initialize some variables set by options. + ac_init_help= +@@ -337,34 +764,48 @@ + # and all the variables that are supposed to be based on exec_prefix + # by default will actually change. + # Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++docdir='${datarootdir}/doc/${PACKAGE}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' + + ac_prev= ++ac_dashdash= + for ac_option + do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then +- eval "$ac_prev=\$ac_option" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; ++ esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case $ac_option in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; +@@ -386,12 +827,18 @@ + --config-cache | -C) + cache_file=config.cache ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +@@ -399,7 +846,17 @@ + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval "enable_$ac_feature=no" ;; ++ eval enable_$ac_feature=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` +@@ -408,11 +865,7 @@ + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "enable_$ac_feature='$ac_optarg'" ;; ++ eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -439,6 +892,12 @@ + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; ++ + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; +@@ -463,13 +922,16 @@ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; ++ + -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst \ +- | --locals | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +@@ -534,6 +996,16 @@ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; ++ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; +@@ -590,11 +1062,7 @@ + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package| sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "with_$ac_package='$ac_optarg'" ;; ++ eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` +@@ -603,7 +1071,7 @@ + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` +- eval "with_$ac_package=no" ;; ++ eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. +@@ -634,8 +1102,7 @@ + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } +- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +- eval "$ac_envvar='$ac_optarg'" ++ eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) +@@ -655,27 +1122,19 @@ + { (exit 1); exit 1; }; } + fi + +-# Be sure to have absolute paths. +-for ac_var in exec_prefix prefix +-do +- eval ac_val=$`echo $ac_var` +- case $ac_val in +- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; +- esac +-done +- +-# Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +- localstatedir libdir includedir oldincludedir infodir mandir ++# Be sure to have absolute directory names. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir + do +- eval ac_val=$`echo $ac_var` ++ eval ac_val=\$$ac_var + case $ac_val in +- [\\/$]* | ?:[\\/]* ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -702,74 +1161,76 @@ + test "$silent" = yes && exec 6>/dev/null + + ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } ++ ++ + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_confdir=`(dirname "$0") 2>/dev/null || ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$0" || + $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X"$0" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + srcdir=$ac_confdir +- if test ! -r $srcdir/$ac_unique_file; then ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +- { (exit 1); exit 1; }; } +- else +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +- fi + fi +-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } +-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +-ac_env_build_alias_set=${build_alias+set} +-ac_env_build_alias_value=$build_alias +-ac_cv_env_build_alias_set=${build_alias+set} +-ac_cv_env_build_alias_value=$build_alias +-ac_env_host_alias_set=${host_alias+set} +-ac_env_host_alias_value=$host_alias +-ac_cv_env_host_alias_set=${host_alias+set} +-ac_cv_env_host_alias_value=$host_alias +-ac_env_target_alias_set=${target_alias+set} +-ac_env_target_alias_value=$target_alias +-ac_cv_env_target_alias_set=${target_alias+set} +-ac_cv_env_target_alias_value=$target_alias +-ac_env_CC_set=${CC+set} +-ac_env_CC_value=$CC +-ac_cv_env_CC_set=${CC+set} +-ac_cv_env_CC_value=$CC +-ac_env_CFLAGS_set=${CFLAGS+set} +-ac_env_CFLAGS_value=$CFLAGS +-ac_cv_env_CFLAGS_set=${CFLAGS+set} +-ac_cv_env_CFLAGS_value=$CFLAGS +-ac_env_LDFLAGS_set=${LDFLAGS+set} +-ac_env_LDFLAGS_value=$LDFLAGS +-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +-ac_cv_env_LDFLAGS_value=$LDFLAGS +-ac_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_env_CPPFLAGS_value=$CPPFLAGS +-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_cv_env_CPPFLAGS_value=$CPPFLAGS +-ac_env_CPP_set=${CPP+set} +-ac_env_CPP_value=$CPP +-ac_cv_env_CPP_set=${CPP+set} +-ac_cv_env_CPP_value=$CPP ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done + + # + # Report the --help message. +@@ -798,9 +1259,6 @@ + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +-_ACEOF +- +- cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] +@@ -818,15 +1276,22 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -844,6 +1309,7 @@ + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-warnings-are-errors add -Werror to most gcc calls + --disable-sieve disable Sieve support + --enable-krb5afspts compile afskrb PTS module with krb5 support + --disable-server disable compiling servers +@@ -899,126 +1365,99 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory +- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have +- headers in a nonstandard directory ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory + CPP C preprocessor ++ YACC The `Yet Another C Compiler' implementation to use. Defaults to ++ the first program found out of: `bison -y', `byacc', `yacc'. ++ YFLAGS The list of arguments that will be passed by default to $YACC. ++ This script will default YFLAGS to the empty string to avoid a ++ default value of `-d' given by some make applications. + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + + _ACEOF ++ac_status=$? + fi + + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. +- ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d $ac_dir || continue ++ test -d "$ac_dir" || continue + ac_builddir=. + +-if test "$ac_dir" != .; then ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +- cd $ac_dir +- # Check for guested configure; otherwise get Cygnus style configure. +- if test -f $ac_srcdir/configure.gnu; then +- echo +- $SHELL $ac_srcdir/configure.gnu --help=recursive +- elif test -f $ac_srcdir/configure; then +- echo +- $SHELL $ac_srcdir/configure --help=recursive +- elif test -f $ac_srcdir/configure.ac || +- test -f $ac_srcdir/configure.in; then +- echo +- $ac_configure --help ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi +- cd $ac_popdir ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } + done + fi + +-test -n "$ac_init_help" && exit 0 ++test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF ++configure ++generated by GNU Autoconf 2.60a + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +- exit 0 ++ exit + fi +-exec 5>config.log +-cat >&5 <<_ACEOF ++cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + 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 + + $ $0 $@ + + _ACEOF ++exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -1037,7 +1476,7 @@ + /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` + /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` + /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` + /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +@@ -1051,6 +1490,7 @@ + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" + done ++IFS=$as_save_IFS + + } >&5 + +@@ -1072,7 +1512,6 @@ + ac_configure_args= + ac_configure_args0= + ac_configure_args1= +-ac_sep= + ac_must_keep_next=false + for ac_pass in 1 2 + do +@@ -1083,7 +1522,7 @@ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ++ *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +@@ -1105,9 +1544,7 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +- # Get rid of the leading space. +- ac_sep=" " ++ ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +@@ -1118,8 +1555,8 @@ + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there + # would cause problems or look ugly. +-# WARNING: Be sure not to use single quotes in there, as some shells, +-# such as our DU 5.0 friend, will then `close' the trap. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { +@@ -1132,20 +1569,34 @@ + _ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done + (set) 2>&1 | +- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) + sed -n \ +- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" +- ;; ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( + *) +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} ++ esac | ++ sort ++) + echo + + cat <<\_ASBOX +@@ -1156,22 +1607,28 @@ + echo + for ac_var in $ac_subst_vars + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +-## ------------- ## +-## Output files. ## +-## ------------- ## ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## + _ASBOX + echo + for ac_var in $ac_subst_files + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -1183,26 +1640,24 @@ + ## ----------- ## + _ASBOX + echo +- sed "/^$/d" confdefs.h | sort ++ cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 +- rm -f core *.core && +- rm -rf conftest* confdefs* conf$$* $ac_clean_files && ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +- ' 0 ++' 0 + for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo >confdefs.h ++rm -f -r conftest* confdefs.h + + # Predefined preprocessor variables. + +@@ -1233,14 +1688,17 @@ + + # Let the site file select an alternate cache file if it wants to. + # Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi ++if test -n "$CONFIG_SITE"; then ++ set x "$CONFIG_SITE" ++elif test "x$prefix" != xNONE; then ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" ++else ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" + fi +-for ac_site_file in $CONFIG_SITE; do ++shift ++for ac_site_file ++do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} +@@ -1256,8 +1714,8 @@ + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +- [\\/]* | ?:[\\/]* ) . $cache_file;; +- *) . ./$cache_file;; ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; + esac + fi + else +@@ -1269,12 +1727,11 @@ + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +-for ac_var in `(set) 2>&1 | +- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do ++for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val="\$ac_cv_env_${ac_var}_value" +- eval ac_new_val="\$ac_env_${ac_var}_value" ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +@@ -1299,8 +1756,7 @@ + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -1317,12 +1773,6 @@ + { (exit 1); exit 1; }; } + fi + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- + + + +@@ -1339,106 +1789,154 @@ + + + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +- ac_config_headers="$ac_config_headers config.h" ++ac_config_headers="$ac_config_headers config.h" + + ac_aux_dir= +-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +- if test -f $ac_dir/install-sh; then ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break +- elif test -f $ac_dir/install.sh; then ++ elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break +- elif test -f $ac_dir/shtool; then ++ elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } + fi +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" +-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ + + # Make sure we can run config.sub. +-$ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +-echo "$as_me: error: cannot run $ac_config_sub" >&2;} ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6; } + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_build_alias=$build_alias +-test -z "$ac_cv_build_alias" && +- ac_cv_build_alias=`$ac_config_guess` +-test -z "$ac_cv_build_alias" && ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} ++ { (exit 1); exit 1; }; };; ++esac + build=$ac_cv_build +-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6; } + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_host_alias=$host_alias +-test -z "$ac_cv_host_alias" && +- ac_cv_host_alias=$ac_cv_build_alias +-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } ++fi + + fi +-echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} ++ { (exit 1); exit 1; }; };; ++esac + host=$ac_cv_host +-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ++ + + ++WARNERROR=-W ++# Check whether --enable-warnings-are-errors was given. ++if test "${enable_warnings_are_errors+set}" = set; then ++ enableval=$enable_warnings_are_errors; if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi ++fi ++ + + +-# Check whether --with-extraident or --without-extraident was given. +-if test "${with_extraident+set}" = set; then +- withval="$with_extraident" + ++# Check whether --with-extraident was given. ++if test "${with_extraident+set}" = set; then ++ withval=$with_extraident; + cat >>confdefs.h <<_ACEOF + #define EXTRA_IDENT "$withval" + _ACEOF + +-fi; ++fi ++ + + # Extract the first word of "makedepend", so it can be a program name with args. + set dummy makedepend; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1451,50 +1949,52 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MAKEDEPEND="makedepend" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep" + fi + fi + MAKEDEPEND=$ac_cv_prog_MAKEDEPEND + if test -n "$MAKEDEPEND"; then +- echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5 +-echo "${ECHO_T}$MAKEDEPEND" >&6 ++ { echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5 ++echo "${ECHO_T}$MAKEDEPEND" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + if test "$MAKEDEPEND" != "makedepend"; then + { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&5 + echo "$as_me: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&2;} + fi + + +-# Check whether --with-login or --without-login was given. ++# Check whether --with-login was given. + if test "${with_login+set}" = set; then +- withval="$with_login" +- { { echo "$as_me:$LINENO: error: --with-login is no longer supported. ++ withval=$with_login; { { echo "$as_me:$LINENO: error: --with-login is no longer supported. + Configure SASL appropriately instead." >&5 + echo "$as_me: error: --with-login is no longer supported. + Configure SASL appropriately instead." >&2;} + { (exit 1); exit 1; }; } +-fi; ++fi + + +-# Check whether --with-cyrus-prefix or --without-cyrus-prefix was given. ++ ++# Check whether --with-cyrus-prefix was given. + if test "${with_cyrus_prefix+set}" = set; then +- withval="$with_cyrus_prefix" +- cyrus_prefix="$withval" ++ withval=$with_cyrus_prefix; cyrus_prefix="$withval" + else + cyrus_prefix="/usr/cyrus" +-fi; ++fi ++ + + + cat >>confdefs.h <<_ACEOF +@@ -1502,13 +2002,13 @@ + _ACEOF + + +-# Check whether --with-service-path or --without-service-path was given. ++# Check whether --with-service-path was given. + if test "${with_service_path+set}" = set; then +- withval="$with_service_path" +- service_path="$withval" ++ withval=$with_service_path; service_path="$withval" + else + service_path="$cyrus_prefix/bin" +-fi; ++fi ++ + + + cat >>confdefs.h <<_ACEOF +@@ -1516,13 +2016,13 @@ + _ACEOF + + +-# Check whether --with-cyrus-user or --without-cyrus-user was given. ++# Check whether --with-cyrus-user was given. + if test "${with_cyrus_user+set}" = set; then +- withval="$with_cyrus_user" +- cyrus_user="$withval" ++ withval=$with_cyrus_user; cyrus_user="$withval" + else + cyrus_user="cyrus" +-fi; ++fi ++ + + + cat >>confdefs.h <<_ACEOF +@@ -1530,13 +2030,13 @@ + _ACEOF + + +-# Check whether --with-cyrus-group or --without-cyrus-group was given. ++# Check whether --with-cyrus-group was given. + if test "${with_cyrus_group+set}" = set; then +- withval="$with_cyrus_group" +- cyrus_group="$withval" ++ withval=$with_cyrus_group; cyrus_group="$withval" + else + cyrus_group="mail" +-fi; ++fi ++ + + + if test $sysconfdir = '${prefix}/etc'; then +@@ -1556,8 +2056,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1570,32 +2070,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1608,36 +2110,51 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + else + CC="$ac_cv_prog_CC" + fi + + if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1650,74 +2167,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi + ++ fi + fi + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1731,7 +2208,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -1742,6 +2219,7 @@ + fi + done + done ++IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. +@@ -1759,22 +2237,23 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1787,36 +2266,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$CC" && break + done + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1829,29 +2310,45 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$ac_ct_CC" && break + done + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + fi + + fi +@@ -1864,21 +2361,35 @@ + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C compiler version" >&5 ++echo "$as_me:$LINENO: checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +@@ -1903,47 +2414,77 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +- (eval $ac_link_default) 2>&5 ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- # Find the output, starting from the most likely. This scheme is +-# not robust to junk in `.', hence go to wildcards (a.*) only as a last +-# resort. +- +-# Be careful to initialize this variable, since it used to be cached. +-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +-ac_cv_exeext= +-# b.out is created by i960 compilers. +-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) +- ;; +- conftest.$ac_ext ) +- # This is the source file. ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- # FIXME: I believe we export ac_cv_exeext for Libtool, +- # but it would be cool to find out if it's true. Does anybody +- # maintain Libtool? --akim. +- export ac_cv_exeext ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. + break;; + * ) + break;; + esac + done ++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 @@ + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6 + +-# Check the compiler produces executables we can run. If not, either ++# Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -1986,22 +2529,27 @@ + fi + fi + fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + rm -f a.out a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check the compiler produces executables we can run. If not, either ++# Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6 ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } + +-echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -2012,9 +2560,8 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- export ac_cv_exeext + break;; + * ) break;; + esac +@@ -2028,14 +2575,14 @@ + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2055,14 +2602,20 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +@@ -2080,12 +2633,12 @@ + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2108,24 +2661,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -2134,24 +2699,28 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-CFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2167,24 +2736,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -2193,12 +2774,131 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_prog_cc_g=no ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_g=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -2214,12 +2914,12 @@ + CFLAGS= + fi + fi +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_stdc+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_prog_cc_stdc=no ++ ac_cv_prog_cc_c89=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -2253,12 +2953,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 +- as 'x'. The following induces an error, until -std1 is added to get ++ as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std1. */ ++ that's true only with -std. */ + int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; +@@ -2273,205 +2978,74 @@ + return 0; + } + _ACEOF +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break ++ ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext ++ ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break + done +-rm -f conftest.$ac_ext conftest.$ac_objext ++rm -f conftest.$ac_ext + CC=$ac_save_CC + + fi +- +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; + *) +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + esac + +-# Some people use a C++ compiler to compile C. Since we use `exit', +-# in C++ we need to declare it. In case someone uses the same compiler +-# for both compiling C and C++ we need to have the C++ compiler decide +-# the declaration of exit, since it's the most demanding environment. +-cat >conftest.$ac_ext <<_ACEOF +-#ifndef __cplusplus +- choke me +-#endif +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2481,8 +3055,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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2495,32 +3069,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6 ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2533,57 +3109,72 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- RANLIB=$ac_ct_RANLIB ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi + else + RANLIB="$ac_cv_prog_RANLIB" + fi + +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh + all: +- @echo 'ac_maketemp="$(MAKE)"' ++ @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac + rm -f conftest.make + fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -2600,8 +3191,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. +-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + 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 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2642,21 +3233,22 @@ + ;; + esac + done ++IFS=$as_save_IFS + + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the path is relative. ++ # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6 ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # 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 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -2707,8 +3299,13 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -2733,9 +3330,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -2745,8 +3343,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -2773,6 +3376,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -2790,8 +3394,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6 ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -2814,8 +3418,13 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -2840,9 +3449,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -2852,8 +3462,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -2880,6 +3495,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -2902,24 +3518,171 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +-if test "${ac_cv_prog_egrep+set}" = set; then ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_GREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue ++ # Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count + fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_GREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 +- EGREP=$ac_cv_prog_egrep + ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++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; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_EGREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue ++ # Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_EGREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for AIX" >&5 ++echo $ECHO_N "checking for AIX... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -2933,26 +3696,25 @@ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + cat >>confdefs.h <<\_ACEOF + #define _ALL_SOURCE 1 + _ACEOF + + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + rm -f conftest* + + +-echo "$as_me:$LINENO: checking for library containing strerror" >&5 +-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } + if test "${ac_cv_search_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +-ac_cv_search_strerror=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -2960,115 +3722,89 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char strerror (); + int + main () + { +-strerror (); ++return strerror (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_strerror="none required" ++ ac_cv_search_strerror=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test "$ac_cv_search_strerror" = no; then +- for ac_lib in cposix; do +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char strerror (); +-int +-main () +-{ +-strerror (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_strerror="-l$ac_lib" +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++fi + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then ++ break + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- done ++done ++if test "${ac_cv_search_strerror+set}" = set; then ++ : ++else ++ ac_cv_search_strerror=no + fi ++rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +-echo "${ECHO_T}$ac_cv_search_strerror" >&6 +-if test "$ac_cv_search_strerror" != no; then +- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +@@ -3076,8 +3812,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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3090,30 +3826,32 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6 ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$AWK" && break + done + +-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + 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; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; ++ if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; +@@ -3171,7 +3910,9 @@ + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; ++ if (!foo) return 0; + } ++ return !cs[0] && !zero.x; + #endif + + ; +@@ -3179,24 +3920,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3205,12 +3958,13 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_c_const=no ++ ac_cv_c_const=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +-echo "${ECHO_T}$ac_cv_c_const" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6; } + if test $ac_cv_c_const = no; then + + cat >>confdefs.h <<\_ACEOF +@@ -3219,62 +3973,8 @@ + + fi + +-echo "$as_me:$LINENO: checking for long file names" >&5 +-echo $ECHO_N "checking for long file names... $ECHO_C" >&6 +-if test "${ac_cv_sys_long_file_names+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_sys_long_file_names=yes +-# Test for long file names in all the places we know might matter: +-# . the current directory, where building will happen +-# $prefix/lib where we will be installing things +-# $exec_prefix/lib likewise +-# eval it to expand exec_prefix. +-# $TMPDIR if set, where it might want to write temporary files +-# if $TMPDIR is not set: +-# /tmp where it might want to write temporary files +-# /var/tmp likewise +-# /usr/tmp likewise +-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then +- ac_tmpdirs=$TMPDIR +-else +- ac_tmpdirs='/tmp /var/tmp /usr/tmp' +-fi +-for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do +- test -d $ac_dir || continue +- test -w $ac_dir || continue # It is less confusing to not echo anything here. +- ac_xdir=$ac_dir/cf$$ +- (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue +- ac_tf1=$ac_xdir/conftest9012345 +- ac_tf2=$ac_xdir/conftest9012346 +- (echo 1 >$ac_tf1) 2>/dev/null +- (echo 2 >$ac_tf2) 2>/dev/null +- ac_val=`cat $ac_tf1 2>/dev/null` +- if test ! -f $ac_tf1 || test "$ac_val" != 1; then +- ac_cv_sys_long_file_names=no +- rm -rf $ac_xdir 2>/dev/null +- break +- fi +- rm -rf $ac_xdir 2>/dev/null +-done +-fi +-echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 +-echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 +-if test $ac_cv_sys_long_file_names = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LONG_FILE_NAMES 1 +-_ACEOF +- +-fi +- +-if test $ac_cv_sys_long_file_names = no; then +- { { echo "$as_me:$LINENO: error: The Cyrus IMAPD requires support for long file names" >&5 +-echo "$as_me: error: The Cyrus IMAPD requires support for long file names" >&2;} +- { (exit 1); exit 1; }; } +-fi +-echo "$as_me:$LINENO: checking for inline" >&5 +-echo $ECHO_N "checking for inline... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for inline" >&5 ++echo $ECHO_N "checking for inline... $ECHO_C" >&6; } + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3294,39 +3994,54 @@ + + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_c_inline=$ac_kw; break ++ ac_cv_c_inline=$ac_kw + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ test "$ac_cv_c_inline" != no && break + done + + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +-echo "${ECHO_T}$ac_cv_c_inline" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 ++echo "${ECHO_T}$ac_cv_c_inline" >&6; } + + + case $ac_cv_c_inline in +@@ -3345,157 +4060,8 @@ + esac + + +- +-echo "$as_me:$LINENO: checking for __attribute__" >&5 +-echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6 +-if test "${ac_cv___attribute__+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +- +-int +-main () +-{ +- +-static void foo(void) __attribute__ ((noreturn)); +- +-static void +-foo(void) +-{ +- exit(1); +-} +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv___attribute__=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv___attribute__=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-if test "$ac_cv___attribute__" = "yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE___ATTRIBUTE__ 1 +-_ACEOF +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5 +-echo "${ECHO_T}$ac_cv___attribute__" >&6 +- +- +-echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5 +-echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6 +-if test "${ac_cv_fpic+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +-save_CFLAGS=$CFLAGS +-CFLAGS="${CFLAGS} -fPIC" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +- +-int +-main () +-{ +- +-static void +-foo(void) +-{ +- exit(1); +-} +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_fpic=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_fpic=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-CFLAGS=$save_CFLAGS +- +-fi +- +-if test "$ac_cv_fpic" = "yes"; then +- FPIC_CFLAGS="-fPIC" +-else +- FPIC_CFLAGS="" +-fi +-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5 +-echo "${ECHO_T}$ac_cv_fpic" >&6 +- +- +-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3519,24 +4085,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3545,9 +4123,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +@@ -3603,6 +4182,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include ++#include + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -3622,18 +4202,27 @@ + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3646,12 +4235,14 @@ + ( exit $ac_status ) + ac_cv_header_stdc=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -3674,9 +4265,9 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -3690,24 +4281,36 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3716,12 +4319,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_Header=no" ++ eval "$as_ac_Header=no" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +@@ -3732,9 +4337,9 @@ + done + + +-echo "$as_me:$LINENO: checking for long" >&5 +-echo $ECHO_N "checking for long... $ECHO_C" >&6 +-if test "${ac_cv_type_long+set}" = set; then ++{ echo "$as_me:$LINENO: checking for long long int" >&5 ++echo $ECHO_N "checking for long long int... $ECHO_C" >&6; } ++if test "${ac_cv_type_long_long_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -3744,61 +4349,74 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++typedef long long int ac__type_new_; + int + main () + { +-if ((long *) 0) ++if ((ac__type_new_ *) 0) + return 0; +-if (sizeof (long)) ++if (sizeof (ac__type_new_)) + return 0; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_type_long=yes ++ ac_cv_type_long_long_int=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_type_long=no ++ ac_cv_type_long_long_int=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +-echo "${ECHO_T}$ac_cv_type_long" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; } + +-echo "$as_me:$LINENO: checking size of long" >&5 +-echo $ECHO_N "checking size of long... $ECHO_C" >&6 +-if test "${ac_cv_sizeof_long+set}" = set; then ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ echo "$as_me:$LINENO: checking size of long long int" >&5 ++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6; } ++if test "${ac_cv_sizeof_long_long_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + 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 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long long int ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; + test_array [0] = 0 + + ; +@@ -3819,24 +4439,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3849,10 +4481,12 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long long int ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; + test_array [0] = 0 + + ; +@@ -3860,24 +4494,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3886,30 +4532,33 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` ++ ac_lo=`expr $ac_mid + 1` ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid + 1` + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long long int ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; + test_array [0] = 0 + + ; +@@ -3917,24 +4566,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3947,10 +4608,12 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long long int ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; + test_array [0] = 0 + + ; +@@ -3958,24 +4621,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -3984,24 +4659,27 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` ++ ac_hi=`expr '(' $ac_mid ')' - 1` ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid` + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_lo= ac_hi= ++ ac_lo= ac_hi= + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # 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 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long long int ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; + test_array [0] = 0 + + ; +@@ -4023,24 +4703,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -4049,25 +4741,536 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_lo=`expr '(' $ac_mid ')' + 1` ++ ac_lo=`expr '(' $ac_mid ')' + 1` + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + case $ac_lo in +-?*) 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) + 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 ;; ++esac ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef long long int ac__type_sizeof_; ++ ++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } ++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } ++#include ++#include ++int ++main () ++{ ++ ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ return 1; ++ if (((long int) (sizeof (ac__type_sizeof_))) < 0) ++ { ++ long int i = longval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; ++ fprintf (f, "%ld\n", i); ++ } ++ else ++ { ++ unsigned long int i = ulongval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; ++ fprintf (f, "%lu\n", i); ++ } ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sizeof_long_long_int=`cat conftest.val` ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++if test "$ac_cv_type_long_long_int" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int) ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (long long int) ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++ else ++ ac_cv_sizeof_long_long_int=0 ++ fi ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f conftest.val ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6; } ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int ++_ACEOF ++ ++ ++{ echo "$as_me:$LINENO: checking for unsigned long long int" >&5 ++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; } ++if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++typedef unsigned long long int ac__type_new_; ++int ++main () ++{ ++if ((ac__type_new_ *) 0) ++ return 0; ++if (sizeof (ac__type_new_)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_unsigned_long_long_int=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_unsigned_long_long_int=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6; } ++ ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ echo "$as_me:$LINENO: checking size of unsigned long long int" >&5 ++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6; } ++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ # Depending upon the size, compute the lo and hi bounds. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef unsigned long long int ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef unsigned long long int ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_lo=`expr $ac_mid + 1` ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid + 1` ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef unsigned long long int ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef unsigned long long int ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=$ac_mid; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_hi=`expr '(' $ac_mid ')' - 1` ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid` ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_lo= ac_hi= ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef unsigned long long int ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_lo=`expr '(' $ac_mid ')' + 1` ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in ++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;; ++'') if test "$ac_cv_type_unsigned_long_long_int" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int) + See \`config.log' for more details." >&5 +-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 ;; ++esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4076,8 +5279,10 @@ + 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_; ++ ++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } ++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } + #include + #include + int +@@ -4086,177 +5291,1067 @@ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) +- exit (1); +- if (((long) (sizeof (long))) < 0) ++ return 1; ++ if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { +- long i = longval (); +- if (i != ((long) (sizeof (long)))) +- exit (1); ++ long int i = longval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; + fprintf (f, "%ld\n", i); + } + else + { +- unsigned long i = ulongval (); +- if (i != ((long) (sizeof (long)))) +- exit (1); ++ unsigned long int i = ulongval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; + fprintf (f, "%lu\n", i); + } +- exit (ferror (f) || fclose (f) != 0); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_sizeof_long=`cat conftest.val` ++ ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val` + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 ++if test "$ac_cv_type_unsigned_long_long_int" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int) + See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (long), 77 ++echo "$as_me: error: cannot compute sizeof (unsigned long long int) + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-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 ++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6; } ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int ++_ACEOF ++ ++ ++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \ ++ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LONG_LONG_INT ++_ACEOF ++ ++ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 ++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } ++if test "${ac_cv_c_bigendian+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_sizeof_long=0 ++ # See if sys/param.h defines the BYTE_ORDER macro. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ ++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) ++ bogus endian macros ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ # It does; now see whether it defined to BIG_ENDIAN or not. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if BYTE_ORDER != BIG_ENDIAN ++ not big endian ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_bigendian=no + fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # It does not; compile a test program. ++if test "$cross_compiling" = yes; then ++ # try to guess the endianness by grepping values into an object file ++ ac_cv_c_bigendian=unknown ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } ++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } ++int ++main () ++{ ++ _ascii (); _ebcdic (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ 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 ++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then ++ if test "$ac_cv_c_bigendian" = unknown; then ++ ac_cv_c_bigendian=no ++ else ++ # finding both strings is unlikely to happen, but who knows? ++ ac_cv_c_bigendian=unknown ++ fi ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ + _ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ + ++ /* Are we little or big endian? From Harbison&Steele. */ ++ union ++ { ++ long int l; ++ char c[sizeof (long int)]; ++ } u; ++ u.l = 1; ++ return u.c[sizeof (long int) - 1] == 1; + ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=no ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++( exit $ac_status ) ++ac_cv_c_bigendian=yes ++fi ++rm -f core *.core 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 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 ++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } ++case $ac_cv_c_bigendian in ++ yes) ++ ++cat >>confdefs.h <<\_ACEOF ++#define WORDS_BIGENDIAN 1 ++_ACEOF ++ ;; ++ no) ++ ;; ++ *) ++ { { echo "$as_me:$LINENO: error: unknown endianness ++presetting ac_cv_c_bigendian=no (or yes) will help" >&5 ++echo "$as_me: error: unknown endianness ++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} ++ { (exit 1); exit 1; }; } ;; ++esac ++ ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking for __attribute__" >&5 ++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; } ++if test "${ac_cv___attribute__+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +- # first, try -R +- SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-R /usr/lib" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++ ++int ++main () ++{ ++ ++static void foo(void) __attribute__ ((noreturn)); ++ ++static void ++foo(void) ++{ ++ exit(1); ++} ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv___attribute__=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv___attribute__=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++if test "$ac_cv___attribute__" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE___ATTRIBUTE__ 1 ++_ACEOF ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5 ++echo "${ECHO_T}$ac_cv___attribute__" >&6; } ++ ++ ++{ echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5 ++echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6; } ++if test "${ac_cv_fpic+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++save_CFLAGS=$CFLAGS ++CFLAGS="${CFLAGS} -fPIC" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++ ++int ++main () ++{ ++ ++static void ++foo(void) ++{ ++ exit(1); ++} ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_fpic=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_fpic=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++CFLAGS=$save_CFLAGS ++ ++fi ++ ++if test "$ac_cv_fpic" = "yes"; then ++ FPIC_CFLAGS="-fPIC" ++else ++ FPIC_CFLAGS="" ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5 ++echo "${ECHO_T}$ac_cv_fpic" >&6; } ++ ++ ++{ echo "$as_me:$LINENO: checking for long" >&5 ++echo $ECHO_N "checking for long... $ECHO_C" >&6; } ++if test "${ac_cv_type_long+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++typedef long ac__type_new_; ++int ++main () ++{ ++if ((ac__type_new_ *) 0) ++ return 0; ++if (sizeof (ac__type_new_)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_long=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_long=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 ++echo "${ECHO_T}$ac_cv_type_long" >&6; } ++ ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ echo "$as_me:$LINENO: checking size of long" >&5 ++echo $ECHO_N "checking size of long... $ECHO_C" >&6; } ++if test "${ac_cv_sizeof_long+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef long ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=0 ac_mid=0 ++ while :; do + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++$ac_includes_default ++ typedef long ac__type_sizeof_; + + int + main () + { ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; ++test_array [0] = 0 + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- andrew_runpath_switch="-R" ++ ac_hi=$ac_mid; break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_lo=`expr $ac_mid + 1` ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid + 1` ++fi + +- LDFLAGS="-Wl,-rpath,/usr/lib" ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef long ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=-1 ac_mid=-1 ++ while :; do + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++$ac_includes_default ++ typedef long ac__type_sizeof_; + + int + main () + { ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; ++test_array [0] = 0 + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- andrew_runpath_switch="-Wl,-rpath," ++ ac_lo=$ac_mid; break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-andrew_runpath_switch="none" ++ ac_hi=`expr '(' $ac_mid ')' - 1` ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid` + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_lo= ac_hi= + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="${SAVE_LDFLAGS}" + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5 +-echo "${ECHO_T}$andrew_runpath_switch" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef long ac__type_sizeof_; ++ ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_lo=`expr '(' $ac_mid ')' + 1` ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in ++?*) ac_cv_sizeof_long=$ac_lo;; ++'') if test "$ac_cv_type_long" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (long) ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++ else ++ ac_cv_sizeof_long=0 ++ fi ;; ++esac ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ typedef long ac__type_sizeof_; ++ ++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } ++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } ++#include ++#include ++int ++main () ++{ ++ ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ return 1; ++ if (((long int) (sizeof (ac__type_sizeof_))) < 0) ++ { ++ long int i = longval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; ++ fprintf (f, "%ld\n", i); ++ } ++ else ++ { ++ unsigned long int i = ulongval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; ++ fprintf (f, "%lu\n", i); ++ } ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sizeof_long=`cat conftest.val` ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++if test "$ac_cv_type_long" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (long) ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++ else ++ ac_cv_sizeof_long=0 ++ fi ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f conftest.val ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 ++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG $ac_cv_sizeof_long ++_ACEOF ++ ++ ++ ++ ++ # CMU GUESS RUNPATH SWITCH ++ andrew_runpath_switch="none" ++ + + + +@@ -4265,18 +6360,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` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4287,24 +6383,36 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -4313,15 +6421,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4330,8 +6439,13 @@ + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -4355,9 +6469,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -4381,25 +6496,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -4418,9 +6527,9 @@ + for ac_func in memmove strcasecmp ftruncate strerror + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -4446,53 +6555,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -4501,25 +6616,25 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + else +- case $LIBOBJS in +- "$ac_func.$ac_objext" | \ +- *" $ac_func.$ac_objext" | \ +- "$ac_func.$ac_objext "* | \ ++ case " $LIBOBJS " in + *" $ac_func.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; ++ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ++ ;; + esac + + fi +@@ -4531,9 +6646,9 @@ + for ac_func in strlcat strlcpy + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -4559,53 +6674,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -4614,13 +6735,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -4637,9 +6760,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` +-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 ++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -4661,24 +6784,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -4687,12 +6822,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_Header=no" ++ eval "$as_ac_Header=no" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +@@ -4704,13 +6841,12 @@ + done + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then +- echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5 ++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } + if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +-ac_cv_search_opendir=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4718,126 +6854,99 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char opendir (); + int + main () + { +-opendir (); ++return opendir (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++for ac_lib in '' dir; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_opendir="none required" ++ ac_cv_search_opendir=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test "$ac_cv_search_opendir" = no; then +- for ac_lib in dir; do +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char opendir (); +-int +-main () +-{ +-opendir (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_opendir="-l$ac_lib" +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++fi + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then ++ break + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- done ++done ++if test "${ac_cv_search_opendir+set}" = set; then ++ : ++else ++ ac_cv_search_opendir=no + fi ++rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6 +-if test "$ac_cv_search_opendir" != no; then +- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 ++echo "${ECHO_T}$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + + else +- echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5 ++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } + if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +-ac_cv_search_opendir=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4845,115 +6954,89 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char opendir (); + int + main () + { +-opendir (); ++return opendir (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++for ac_lib in '' x; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_opendir="none required" ++ ac_cv_search_opendir=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test "$ac_cv_search_opendir" = no; then +- for ac_lib in x; do +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char opendir (); +-int +-main () +-{ +-opendir (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_opendir="-l$ac_lib" +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++fi + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then ++ break + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- done ++done ++if test "${ac_cv_search_opendir+set}" = set; then ++ : ++else ++ ac_cv_search_opendir=no + fi ++rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6 +-if test "$ac_cv_search_opendir" != no; then +- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 ++echo "${ECHO_T}$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +@@ -4963,8 +7046,8 @@ + + save_LIBS="$LIBS" + LIB_SOCKET="" +- echo "$as_me:$LINENO: checking for connect" >&5 +-echo $ECHO_N "checking for connect... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for connect" >&5 ++echo $ECHO_N "checking for connect... $ECHO_C" >&6; } + if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4991,53 +7074,59 @@ + + #undef connect + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char connect (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_connect) || defined (__stub___connect) ++#if defined __stub_connect || defined __stub___connect + choke me +-#else +-char (*f) () = connect; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != connect; ++return connect (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5046,18 +7135,19 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_connect=no ++ ac_cv_func_connect=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-echo "${ECHO_T}$ac_cv_func_connect" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 ++echo "${ECHO_T}$ac_cv_func_connect" >&6; } + if test $ac_cv_func_connect = yes; then + : + else +- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 ++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5070,40 +7160,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gethostbyname (); + int + main () + { +-gethostbyname (); ++return gethostbyname (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5112,20 +7214,21 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_nsl_gethostbyname=no ++ ac_cv_lib_nsl_gethostbyname=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } + if test $ac_cv_lib_nsl_gethostbyname = yes; then + LIB_SOCKET="-lnsl $LIB_SOCKET" + fi + +- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 ++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } + if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5138,40 +7241,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char connect (); + int + main () + { +-connect (); ++return connect (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5180,14 +7295,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_socket_connect=no ++ ac_cv_lib_socket_connect=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } + if test $ac_cv_lib_socket_connect = yes; then + LIB_SOCKET="-lsocket $LIB_SOCKET" + fi +@@ -5196,8 +7312,8 @@ + fi + + LIBS="$LIB_SOCKET $save_LIBS" +- echo "$as_me:$LINENO: checking for res_search" >&5 +-echo $ECHO_N "checking for res_search... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for res_search" >&5 ++echo $ECHO_N "checking for res_search... $ECHO_C" >&6; } + if test "${ac_cv_func_res_search+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5224,53 +7340,59 @@ + + #undef res_search + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char res_search (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_res_search) || defined (__stub___res_search) ++#if defined __stub_res_search || defined __stub___res_search + choke me +-#else +-char (*f) () = res_search; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != res_search; ++return res_search (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5279,13 +7401,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_res_search=no ++ ac_cv_func_res_search=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5 +-echo "${ECHO_T}$ac_cv_func_res_search" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5 ++echo "${ECHO_T}$ac_cv_func_res_search" >&6; } + if test $ac_cv_func_res_search = yes; then + : + else +@@ -5318,24 +7441,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5344,8 +7479,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -5356,9 +7493,9 @@ + for ac_func in dn_expand dns_lookup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -5384,53 +7521,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5439,13 +7582,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -5461,8 +7606,8 @@ + + cyrus_cv_getaddrinfo=yes + +-echo "$as_me:$LINENO: checking for getaddrinfo" >&5 +-echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5 ++echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; } + if test "${ac_cv_func_getaddrinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5489,53 +7634,59 @@ + + #undef getaddrinfo + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char getaddrinfo (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) ++#if defined __stub_getaddrinfo || defined __stub___getaddrinfo + choke me +-#else +-char (*f) () = getaddrinfo; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != getaddrinfo; ++return getaddrinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5544,20 +7695,21 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_getaddrinfo=no ++ ac_cv_func_getaddrinfo=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 +-echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 ++echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; } + if test $ac_cv_func_getaddrinfo = yes; then + ac_cv_lib_socket_getaddrinfo=no + ac_cv_lib_inet6_getaddrinfo=no + + else +- echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5 +-echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5 ++echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6; } + if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5570,40 +7722,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char getaddrinfo (); + int + main () + { +-getaddrinfo (); ++return getaddrinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5612,21 +7776,22 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_socket_getaddrinfo=no ++ ac_cv_lib_socket_getaddrinfo=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6; } + if test $ac_cv_lib_socket_getaddrinfo = yes; then + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_getaddrinfo=no + + else +- echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5 +-echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5 ++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; } + if test "${ipv6_cv_dir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5636,8 +7801,8 @@ + fi + done + fi +- echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5 +-echo "${ECHO_T}$ipv6_cv_dir" >&6 ++ { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5 ++echo "${ECHO_T}$ipv6_cv_dir" >&6; } + if test $ipv6_cv_dir = no; then + ac_cv_lib_inet6_getaddrinfo=no + else +@@ -5646,8 +7811,8 @@ + SAVELDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" + fi +- echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5 +-echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5 ++echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6; } + if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5660,40 +7825,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char getaddrinfo (); + int + main () + { +-getaddrinfo (); ++return getaddrinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5702,14 +7879,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_inet6_getaddrinfo=no ++ ac_cv_lib_inet6_getaddrinfo=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5 ++echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6; } + if test $ac_cv_lib_inet6_getaddrinfo = yes; then + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes +@@ -5744,9 +7922,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` +-echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5 +-echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5 ++echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -5772,53 +7950,59 @@ + + #undef ${ipv6_cv_pfx}getaddrinfo + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char ${ipv6_cv_pfx}getaddrinfo (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_${ipv6_cv_pfx}getaddrinfo) || defined (__stub___${ipv6_cv_pfx}getaddrinfo) ++#if defined __stub_${ipv6_cv_pfx}getaddrinfo || defined __stub___${ipv6_cv_pfx}getaddrinfo + choke me +-#else +-char (*f) () = ${ipv6_cv_pfx}getaddrinfo; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != ${ipv6_cv_pfx}getaddrinfo; ++return ${ipv6_cv_pfx}getaddrinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5827,13 +8011,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + rm -f conftest* +@@ -5852,8 +8038,8 @@ + fi + if test $ipv6_cv_getaddrinfo = yes; then + +-echo "$as_me:$LINENO: checking for gai_strerror" >&5 +-echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for gai_strerror" >&5 ++echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6; } + if test "${ac_cv_func_gai_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5880,53 +8066,59 @@ + + #undef gai_strerror + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gai_strerror (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror) ++#if defined __stub_gai_strerror || defined __stub___gai_strerror + choke me +-#else +-char (*f) () = gai_strerror; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != gai_strerror; ++return gai_strerror (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5935,20 +8127,21 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_gai_strerror=no ++ ac_cv_func_gai_strerror=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5 +-echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5 ++echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6; } + if test $ac_cv_func_gai_strerror = yes; then + ac_cv_lib_socket_gai_strerror=no + ac_cv_lib_inet6_gai_strerror=no + + else +- echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5 +-echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5 ++echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6; } + if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5961,40 +8154,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gai_strerror (); + int + main () + { +-gai_strerror (); ++return gai_strerror (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6003,21 +8208,22 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_socket_gai_strerror=no ++ ac_cv_lib_socket_gai_strerror=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5 +-echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6; } + if test $ac_cv_lib_socket_gai_strerror = yes; then + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_gai_strerror=no + + else +- echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5 +-echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5 ++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; } + if test "${ipv6_cv_dir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6027,8 +8233,8 @@ + fi + done + fi +- echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5 +-echo "${ECHO_T}$ipv6_cv_dir" >&6 ++ { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5 ++echo "${ECHO_T}$ipv6_cv_dir" >&6; } + if test $ipv6_cv_dir = no; then + ac_cv_lib_inet6_gai_strerror=no + else +@@ -6037,8 +8243,8 @@ + SAVELDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" + fi +- echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5 +-echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5 ++echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6; } + if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6051,40 +8257,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gai_strerror (); + int + main () + { +-gai_strerror (); ++return gai_strerror (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6093,14 +8311,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_inet6_gai_strerror=no ++ ac_cv_lib_inet6_gai_strerror=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5 +-echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5 ++echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6; } + if test $ac_cv_lib_inet6_gai_strerror = yes; then + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes +@@ -6135,9 +8354,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` +-echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5 +-echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5 ++echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -6163,53 +8382,59 @@ + + #undef ${ipv6_cv_pfx}gai_strerror + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char ${ipv6_cv_pfx}gai_strerror (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_${ipv6_cv_pfx}gai_strerror) || defined (__stub___${ipv6_cv_pfx}gai_strerror) ++#if defined __stub_${ipv6_cv_pfx}gai_strerror || defined __stub___${ipv6_cv_pfx}gai_strerror + choke me +-#else +-char (*f) () = ${ipv6_cv_pfx}gai_strerror; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != ${ipv6_cv_pfx}gai_strerror; ++return ${ipv6_cv_pfx}gai_strerror (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6218,13 +8443,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + rm -f conftest* +@@ -6260,8 +8487,8 @@ + + cyrus_cv_getnameinfo=yes + +-echo "$as_me:$LINENO: checking for getnameinfo" >&5 +-echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for getnameinfo" >&5 ++echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6; } + if test "${ac_cv_func_getnameinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6288,53 +8515,59 @@ + + #undef getnameinfo + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char getnameinfo (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo) ++#if defined __stub_getnameinfo || defined __stub___getnameinfo + choke me +-#else +-char (*f) () = getnameinfo; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != getnameinfo; ++return getnameinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6343,20 +8576,21 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_getnameinfo=no ++ ac_cv_func_getnameinfo=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5 +-echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5 ++echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6; } + if test $ac_cv_func_getnameinfo = yes; then + ac_cv_lib_socket_getnameinfo=no + ac_cv_lib_inet6_getnameinfo=no + + else +- echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5 +-echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5 ++echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6; } + if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6369,40 +8603,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char getnameinfo (); + int + main () + { +-getnameinfo (); ++return getnameinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6411,21 +8657,22 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_socket_getnameinfo=no ++ ac_cv_lib_socket_getnameinfo=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6; } + if test $ac_cv_lib_socket_getnameinfo = yes; then + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_getnameinfo=no + + else +- echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5 +-echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5 ++echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; } + if test "${ipv6_cv_dir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6435,8 +8682,8 @@ + fi + done + fi +- echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5 +-echo "${ECHO_T}$ipv6_cv_dir" >&6 ++ { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5 ++echo "${ECHO_T}$ipv6_cv_dir" >&6; } + if test $ipv6_cv_dir = no; then + ac_cv_lib_inet6_getnameinfo=no + else +@@ -6445,8 +8692,8 @@ + SAVELDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" + fi +- echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5 +-echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5 ++echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6; } + if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6459,40 +8706,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char getnameinfo (); + int + main () + { +-getnameinfo (); ++return getnameinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6501,14 +8760,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_inet6_getnameinfo=no ++ ac_cv_lib_inet6_getnameinfo=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5 +-echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5 ++echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6; } + if test $ac_cv_lib_inet6_getnameinfo = yes; then + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes +@@ -6543,9 +8803,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` +-echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5 +-echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5 ++echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -6571,53 +8831,59 @@ + + #undef ${ipv6_cv_pfx}getnameinfo + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char ${ipv6_cv_pfx}getnameinfo (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_${ipv6_cv_pfx}getnameinfo) || defined (__stub___${ipv6_cv_pfx}getnameinfo) ++#if defined __stub_${ipv6_cv_pfx}getnameinfo || defined __stub___${ipv6_cv_pfx}getnameinfo + choke me +-#else +-char (*f) () = ${ipv6_cv_pfx}getnameinfo; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != ${ipv6_cv_pfx}getnameinfo; ++return ${ipv6_cv_pfx}getnameinfo (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6626,13 +8892,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + rm -f conftest* +@@ -6664,8 +8932,8 @@ + fi + + +-echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5 +-echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5 ++echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6; } + if test "${ipv6_cv_ss_family+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6686,24 +8954,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6712,9 +8992,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ipv6_cv_ss_family=no ++ ipv6_cv_ss_family=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ipv6_cv_ss_family = yes; then + +@@ -6725,11 +9006,11 @@ + else + : + fi +-echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5 +-echo "${ECHO_T}$ipv6_cv_ss_family" >&6 ++{ echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5 ++echo "${ECHO_T}$ipv6_cv_ss_family" >&6; } + +-echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5 +-echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5 ++echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6; } + if test "${ipv6_cv_sa_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6750,24 +9031,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6776,9 +9069,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ipv6_cv_sa_len=no ++ ipv6_cv_sa_len=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ipv6_cv_sa_len = yes; then + +@@ -6789,8 +9083,8 @@ + else + : + fi +-echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5 +-echo "${ECHO_T}$ipv6_cv_sa_len" >&6 ++{ echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5 ++echo "${ECHO_T}$ipv6_cv_sa_len" >&6; } + + + +@@ -6798,18 +9092,19 @@ + for ac_header in sys/time.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6820,24 +9115,36 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6846,15 +9153,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6863,8 +9171,13 @@ + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -6888,9 +9201,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -6914,25 +9228,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -6944,8 +9252,8 @@ + + done + +-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 ++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6969,24 +9277,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6995,12 +9315,13 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_header_time=no ++ ac_cv_header_time=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +-echo "${ECHO_T}$ac_cv_header_time" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 ++echo "${ECHO_T}$ac_cv_header_time" >&6; } + if test $ac_cv_header_time = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -7009,8 +9330,8 @@ + + fi + +-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } + if test "${ac_cv_struct_tm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7032,24 +9353,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7058,12 +9391,13 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_struct_tm=sys/time.h ++ ac_cv_struct_tm=sys/time.h + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 +-echo "${ECHO_T}$ac_cv_struct_tm" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 ++echo "${ECHO_T}$ac_cv_struct_tm" >&6; } + if test $ac_cv_struct_tm = sys/time.h; then + + cat >>confdefs.h <<\_ACEOF +@@ -7072,8 +9406,8 @@ + + fi + +-echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 +-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 ++echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; } + if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7098,24 +9432,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7124,7 +9470,7 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7145,24 +9491,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7171,14 +9529,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_member_struct_tm_tm_zone=no ++ ac_cv_member_struct_tm_tm_zone=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 +-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; } + if test $ac_cv_member_struct_tm_tm_zone = yes; then + + cat >>confdefs.h <<_ACEOF +@@ -7195,8 +9555,95 @@ + _ACEOF + + else +- echo "$as_me:$LINENO: checking for tzname" >&5 +-echo $ECHO_N "checking for tzname... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether tzname is declared" >&5 ++echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; } ++if test "${ac_cv_have_decl_tzname+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++int ++main () ++{ ++#ifndef tzname ++ char *p = (char *) tzname; ++ return !p; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_tzname=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_have_decl_tzname=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; } ++if test $ac_cv_have_decl_tzname = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_TZNAME 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_TZNAME 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for tzname" >&5 ++echo $ECHO_N "checking for tzname... $ECHO_C" >&6; } + if test "${ac_cv_var_tzname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7207,37 +9654,49 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include +-#ifndef tzname /* For SGI. */ +-extern char *tzname[]; /* RS6000 and others reject char **tzname. */ ++#if !HAVE_DECL_TZNAME ++extern char *tzname[]; + #endif + + int + main () + { +-atoi(*tzname); ++return tzname[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 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7246,13 +9705,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_var_tzname=no ++ ac_cv_var_tzname=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 +-echo "${ECHO_T}$ac_cv_var_tzname" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 ++echo "${ECHO_T}$ac_cv_var_tzname" >&6; } + if test $ac_cv_var_tzname = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -7272,9 +9732,9 @@ + for ac_func in vprintf + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -7300,53 +9760,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7355,20 +9821,22 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + +-echo "$as_me:$LINENO: checking for _doprnt" >&5 +-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for _doprnt" >&5 ++echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; } + if test "${ac_cv_func__doprnt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7395,53 +9863,59 @@ + + #undef _doprnt + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char _doprnt (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub__doprnt) || defined (__stub____doprnt) ++#if defined __stub__doprnt || defined __stub____doprnt + choke me +-#else +-char (*f) () = _doprnt; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != _doprnt; ++return _doprnt (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7450,13 +9924,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func__doprnt=no ++ ac_cv_func__doprnt=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 +-echo "${ECHO_T}$ac_cv_func__doprnt" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 ++echo "${ECHO_T}$ac_cv_func__doprnt" >&6; } + if test $ac_cv_func__doprnt = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -7475,20 +9950,20 @@ + + + +-# Check whether --with-bdb or --without-bdb was given. ++# Check whether --with-bdb was given. + if test "${with_bdb+set}" = set; then +- withval="$with_bdb" +- with_bdb=$withval ++ withval=$with_bdb; with_bdb=$withval + else + with_bdb="yes" +-fi; ++fi + + +-# Check whether --with-dbdir or --without-dbdir was given. ++ ++# Check whether --with-dbdir was given. + if test "${with_dbdir+set}" = set; then +- withval="$with_dbdir" +- with_bdb=$withval +-fi; ++ withval=$with_dbdir; with_bdb=$withval ++fi ++ + + case "$with_bdb" in + no) +@@ -7510,21 +9985,21 @@ + if test "$use_berkeley" != "no"; then + + +-# Check whether --with-bdb-libdir or --without-bdb-libdir was given. ++# Check whether --with-bdb-libdir was given. + if test "${with_bdb_libdir+set}" = set; then +- withval="$with_bdb_libdir" +- with_bdb_lib=$withval ++ withval=$with_bdb_libdir; with_bdb_lib=$withval + else + test "${with_bdb_lib+set}" = set || with_bdb_lib=none +-fi; ++fi + +-# Check whether --with-bdb-incdir or --without-bdb-incdir was given. ++ ++# Check whether --with-bdb-incdir was given. + if test "${with_bdb_incdir+set}" = set; then +- withval="$with_bdb_incdir" +- with_bdb_inc=$withval ++ withval=$with_bdb_incdir; with_bdb_inc=$withval + else + test "${with_bdb_inc+set}" = set || with_bdb_inc=none +-fi; ++fi ++ + + + +@@ -7539,17 +10014,17 @@ + fi + + if test "${ac_cv_header_db_h+set}" = set; then +- echo "$as_me:$LINENO: checking for db.h" >&5 +-echo $ECHO_N "checking for db.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for db.h" >&5 ++echo $ECHO_N "checking for db.h... $ECHO_C" >&6; } + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 +-echo "${ECHO_T}$ac_cv_header_db_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 ++echo "${ECHO_T}$ac_cv_header_db_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking db.h usability" >&5 +-echo $ECHO_N "checking db.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking db.h usability" >&5 ++echo $ECHO_N "checking db.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7560,24 +10035,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7586,15 +10073,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking db.h presence" >&5 +-echo $ECHO_N "checking db.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking db.h presence" >&5 ++echo $ECHO_N "checking db.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7603,8 +10091,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -7628,9 +10121,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -7654,25 +10148,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for db.h" >&5 +-echo $ECHO_N "checking for db.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for db.h" >&5 ++echo $ECHO_N "checking for db.h... $ECHO_C" >&6; } + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_db_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 +-echo "${ECHO_T}$ac_cv_header_db_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 ++echo "${ECHO_T}$ac_cv_header_db_h" >&6; } + + fi + if test $ac_cv_header_db_h = yes; then +@@ -7720,24 +10207,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7746,9 +10245,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-dblib="no" ++ dblib="no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test "$dblib" = "berkeley"; then break; fi + done +@@ -7770,24 +10270,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -7796,9 +10308,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-dblib="no" ++ dblib="no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + LIBS=$saved_LIBS +@@ -7854,13 +10367,13 @@ + + SIEVE_SUBDIRS="" + sievedir="sieve" +-# Check whether --enable-sieve or --disable-sieve was given. ++# Check whether --enable-sieve was given. + if test "${enable_sieve+set}" = set; then +- enableval="$enable_sieve" +- if test "$enableval" = no; then ++ enableval=$enable_sieve; if test "$enableval" = no; then + sievedir="no" + fi +-fi; ++fi ++ + + if test "$sievedir" != "no"; then + SIEVE_OBJS="lmtp_sieve.o smtpclient.o" +@@ -7879,8 +10392,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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_YACC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7893,25 +10406,27 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_YACC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + YACC=$ac_cv_prog_YACC + if test -n "$YACC"; then +- echo "$as_me:$LINENO: result: $YACC" >&5 +-echo "${ECHO_T}$YACC" >&6 ++ { echo "$as_me:$LINENO: result: $YACC" >&5 ++echo "${ECHO_T}$YACC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$YACC" && break + done + test -n "$YACC" || YACC="yacc" +@@ -7920,8 +10435,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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_LEX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7934,236 +10449,196 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LEX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + LEX=$ac_cv_prog_LEX + if test -n "$LEX"; then +- echo "$as_me:$LINENO: result: $LEX" >&5 +-echo "${ECHO_T}$LEX" >&6 ++ { echo "$as_me:$LINENO: result: $LEX" >&5 ++echo "${ECHO_T}$LEX" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$LEX" && break + done + test -n "$LEX" || LEX=":" + +-if test -z "$LEXLIB" +-then +- echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5 +-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6 +-if test "${ac_cv_lib_fl_yywrap+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lfl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" ++if test "x$LEX" != "x:"; then ++ cat >conftest.l <<_ACEOF ++%% ++a { ECHO; } ++b { REJECT; } ++c { yymore (); } ++d { yyless (1); } ++e { yyless (input () != 0); } ++f { unput (yytext[0]); } ++. { BEGIN INITIAL; } ++%% ++#ifdef YYTEXT_POINTER ++extern char *yytext; + #endif +-/* 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 () ++main (void) + { +-yywrap (); +- ; +- return 0; ++ return ! yylex () + ! yywrap (); + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++{ (ac_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); }; }; 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 + +-ac_cv_lib_fl_yywrap=no ++if test -f lex.yy.c; then ++ ac_cv_prog_lex_root=lex.yy ++elif test -f lexyy.c; then ++ ac_cv_prog_lex_root=lexyy ++else ++ { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 ++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} ++ { (exit 1); exit 1; }; } + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5 +-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6 +-if test $ac_cv_lib_fl_yywrap = yes; then +- LEXLIB="-lfl" +-else +- echo "$as_me:$LINENO: checking for yywrap in -ll" >&5 +-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6 +-if test "${ac_cv_lib_l_yywrap+set}" = set; then ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 ++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } ++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root ++ ++if test -z "${LEXLIB+set}"; then ++ { echo "$as_me:$LINENO: checking lex library" >&5 ++echo $ECHO_N "checking lex library... $ECHO_C" >&6; } ++if test "${ac_cv_lib_lex+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ll $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char yywrap (); +-int +-main () +-{ +-yywrap (); +- ; +- return 0; +-} ++ ac_save_LIBS=$LIBS ++ ac_cv_lib_lex='none needed' ++ for ac_lib in '' -lfl -ll; do ++ LIBS="$ac_lib $ac_save_LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++`cat $LEX_OUTPUT_ROOT.c` + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_l_yywrap=yes ++ ac_cv_lib_lex=$ac_lib + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_l_yywrap=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5 +-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6 +-if test $ac_cv_lib_l_yywrap = yes; then +- LEXLIB="-ll" +-fi + + fi + +-fi ++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 +- echo "$as_me:$LINENO: checking lex output file root" >&5 +-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6 +-if test "${ac_cv_prog_lex_root+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # The minimal lex program is just a single line: %%. But some broken lexes +-# (Solaris, I think it was) want two %% lines, so accommodate them. +-cat >conftest.l <<_ACEOF +-%% +-%% +-_ACEOF +-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5 +- (eval $LEX conftest.l) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-if test -f lex.yy.c; then +- ac_cv_prog_lex_root=lex.yy +-elif test -f lexyy.c; then +- ac_cv_prog_lex_root=lexyy +-else +- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 +-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} +- { (exit 1); exit 1; }; } + fi ++{ 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: 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 + `cat $LEX_OUTPUT_ROOT.c` + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8172,15 +10647,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_save_LIBS +-rm -f "${LEX_OUTPUT_ROOT}.c" + + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 +-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 ++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; } + if test $ac_cv_prog_lex_yytext_pointer = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -8188,11 +10664,12 @@ + _ACEOF + + fi ++rm -f conftest.l $LEX_OUTPUT_ROOT.c + + fi + +-echo "$as_me:$LINENO: checking for main in -lfl" >&5 +-echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for main in -lfl" >&5 ++echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6; } + if test "${ac_cv_lib_fl_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8209,30 +10686,42 @@ + int + main () + { +-main (); ++return main (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8241,14 +10730,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_fl_main=no ++ ac_cv_lib_fl_main=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5 +-echo "${ECHO_T}$ac_cv_lib_fl_main" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_fl_main" >&6; } + if test $ac_cv_lib_fl_main = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBFL 1 +@@ -8259,13 +10749,12 @@ + fi + + +- echo "$as_me:$LINENO: checking for library containing regcomp" >&5 +-echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for library containing regcomp" >&5 ++echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6; } + if test "${ac_cv_search_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +-ac_cv_search_regcomp=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8273,115 +10762,89 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char regcomp (); + int + main () + { +-regcomp (); ++return regcomp (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++for ac_lib in '' rx regex; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_regcomp="none required" ++ ac_cv_search_regcomp=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test "$ac_cv_search_regcomp" = no; then +- for ac_lib in rx regex; do +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char regcomp (); +-int +-main () +-{ +-regcomp (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_regcomp="-l$ac_lib" +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++fi + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_regcomp+set}" = set; then ++ break + fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- done ++done ++if test "${ac_cv_search_regcomp+set}" = set; then ++ : ++else ++ ac_cv_search_regcomp=no + fi ++rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5 +-echo "${ECHO_T}$ac_cv_search_regcomp" >&6 +-if test "$ac_cv_search_regcomp" != no; then +- test "$ac_cv_search_regcomp" = "none required" || LIBS="$ac_cv_search_regcomp $LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5 ++echo "${ECHO_T}$ac_cv_search_regcomp" >&6; } ++ac_res=$ac_cv_search_regcomp ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + + cat >>confdefs.h <<\_ACEOF +@@ -8389,17 +10852,17 @@ + _ACEOF + + if test "${ac_cv_header_rxposix_h+set}" = set; then +- echo "$as_me:$LINENO: checking for rxposix.h" >&5 +-echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for rxposix.h" >&5 ++echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; } + if test "${ac_cv_header_rxposix_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5 +-echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5 ++echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking rxposix.h usability" >&5 +-echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking rxposix.h usability" >&5 ++echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8410,24 +10873,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8436,15 +10911,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking rxposix.h presence" >&5 +-echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking rxposix.h presence" >&5 ++echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8453,8 +10929,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -8478,9 +10959,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -8504,25 +10986,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for rxposix.h" >&5 +-echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for rxposix.h" >&5 ++echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; } + if test "${ac_cv_header_rxposix_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_rxposix_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5 +-echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5 ++echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; } + + fi + if test $ac_cv_header_rxposix_h = yes; then +@@ -8544,8 +11019,8 @@ + + + +-echo "$as_me:$LINENO: checking for strerror" >&5 +-echo $ECHO_N "checking for strerror... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for strerror" >&5 ++echo $ECHO_N "checking for strerror... $ECHO_C" >&6; } + if test "${ac_cv_func_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8572,53 +11047,59 @@ + + #undef strerror + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char strerror (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_strerror) || defined (__stub___strerror) ++#if defined __stub_strerror || defined __stub___strerror + choke me +-#else +-char (*f) () = strerror; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != strerror; ++return strerror (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8627,13 +11108,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_strerror=no ++ ac_cv_func_strerror=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5 +-echo "${ECHO_T}$ac_cv_func_strerror" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5 ++echo "${ECHO_T}$ac_cv_func_strerror" >&6; } + if test $ac_cv_func_strerror = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -8653,18 +11135,19 @@ + for ac_header in sys/resource.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8675,24 +11158,36 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8701,15 +11196,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8718,8 +11214,13 @@ + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -8743,9 +11244,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -8769,25 +11271,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -8803,9 +11299,9 @@ + for ac_func in setrlimit + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -8831,53 +11327,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8886,13 +11388,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -8905,9 +11409,9 @@ + for ac_func in getrlimit + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -8933,53 +11437,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -8988,13 +11498,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -9009,9 +11521,9 @@ + for ac_func in daemon setsid + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -9037,53 +11549,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9092,13 +11610,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -9112,9 +11632,9 @@ + for ac_func in shutdown + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -9140,53 +11660,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9195,13 +11721,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -9270,8 +11798,8 @@ + + + spt_type="" +-echo "$as_me:$LINENO: checking for setproctitle" >&5 +-echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for setproctitle" >&5 ++echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6; } + if test "${ac_cv_func_setproctitle+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9298,53 +11826,59 @@ + + #undef setproctitle + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char setproctitle (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_setproctitle) || defined (__stub___setproctitle) ++#if defined __stub_setproctitle || defined __stub___setproctitle + choke me +-#else +-char (*f) () = setproctitle; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != setproctitle; ++return setproctitle (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9353,20 +11887,21 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_setproctitle=no ++ ac_cv_func_setproctitle=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5 +-echo "${ECHO_T}$ac_cv_func_setproctitle" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5 ++echo "${ECHO_T}$ac_cv_func_setproctitle" >&6; } + if test $ac_cv_func_setproctitle = yes; then + spt_type=SPT_BUILTIN + fi + + if test "$spt_type" = ""; then +- echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5 +-echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5 ++echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6; } + if test "${ac_cv_lib_util_setproctitle+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9379,40 +11914,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char setproctitle (); + int + main () + { +-setproctitle (); ++return setproctitle (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9421,14 +11968,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_util_setproctitle=no ++ ac_cv_lib_util_setproctitle=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5 +-echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5 ++echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6; } + if test $ac_cv_lib_util_setproctitle = yes; then + spt_type=SPT_BUILTIN + LIBS="${LIBS} -lutil" +@@ -9437,17 +11985,17 @@ + fi + if test "$spt_type" = ""; then + if test "${ac_cv_header_sys_pstat_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sys/pstat.h" >&5 +-echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sys/pstat.h" >&5 ++echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_pstat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5 +-echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5 ++echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -9458,24 +12006,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9484,15 +12044,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5 +-echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5 ++echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -9501,8 +12062,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -9526,9 +12092,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -9552,25 +12119,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for sys/pstat.h" >&5 +-echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sys/pstat.h" >&5 ++echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_pstat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_pstat_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; } + + fi + if test $ac_cv_header_sys_pstat_h = yes; then +@@ -9581,17 +12141,17 @@ + fi + if test "$spt_type" = ""; then + if test "${ac_cv_header_sys_sysnews_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5 +-echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5 ++echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_sysnews_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5 +-echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5 ++echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -9602,24 +12162,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9628,15 +12200,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5 +-echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5 ++echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -9645,8 +12218,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -9670,9 +12248,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -9696,25 +12275,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5 +-echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5 ++echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_sysnews_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_sysnews_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; } + + fi + if test $ac_cv_header_sys_sysnews_h = yes; then +@@ -9724,61 +12296,72 @@ + + fi + if test "$spt_type" = ""; then +- echo "$as_me:$LINENO: checking for PS_STRINGS" >&5 +-echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6 +- if test "${cyrus_cv_sys_psstrings+set}" = set; then ++ { echo "$as_me:$LINENO: checking for PS_STRINGS" >&5 ++echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6; } ++if test "${cyrus_cv_sys_psstrings+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + + #include + #include +-#ifndef PS_STRINGS +-#include +-#endif ++void *p = PS_STRINGS; ++ + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } && ++ { 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_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + cyrus_cv_sys_psstrings=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- cyrus_cv_sys_psstrings=no ++ cyrus_cv_sys_psstrings=no + fi +-rm -f conftest.err conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +- if test $cyrus_cv_sys_psstrings = yes; then +- spt_type=SPT_PSSTRINGS +- fi +- echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5 +-echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6 ++ if test $cyrus_cv_sys_psstrings = yes; then ++ spt_type=SPT_PSSTRINGS ++ fi ++ { echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5 ++echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6; } + fi + if test "$spt_type" = ""; then +- echo "$as_me:$LINENO: checking for SCO" >&5 +-echo $ECHO_N "checking for SCO... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for SCO" >&5 ++echo $ECHO_N "checking for SCO... $ECHO_C" >&6; } + if test "${cyrus_cv_sys_sco+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9793,8 +12376,13 @@ + #include + #endif + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -9818,18 +12406,19 @@ + + cyrus_cv_sys_sco=no + fi ++ + rm -f conftest.err conftest.$ac_ext + fi + + if test $cyrus_cv_sys_sco = yes; then + spt_type=SPT_SCO + fi +- echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5 +-echo "${ECHO_T}$cyrus_cv_sys_sco" >&6 ++ { echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5 ++echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; } + fi + if test "$spt_type" = ""; then +- echo "$as_me:$LINENO: checking for setproctitle usability" >&5 +-echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for setproctitle usability" >&5 ++echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6; } + if test "${cyrus_cv_sys_setproctitle+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9844,8 +12433,13 @@ + #include + #endif + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -9869,14 +12463,15 @@ + + cyrus_cv_sys_setproctitle=no + fi ++ + rm -f conftest.err conftest.$ac_ext + fi + + if test $cyrus_cv_sys_setproctitle = no; then + spt_type=SPT_NONE + fi +- echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5 +-echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6 ++ { echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5 ++echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6; } + fi + if test "$spt_type" != ""; then + +@@ -9886,8 +12481,8 @@ + + fi + +-echo "$as_me:$LINENO: checking nonblocking method" >&5 +-echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking nonblocking method" >&5 ++echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6; } + if test "${cyrus_cv_sys_nonblock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9912,24 +12507,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9938,19 +12545,20 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-cyrus_cv_sys_nonblock=ioctl ++ cyrus_cv_sys_nonblock=ioctl + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + + WITH_NONBLOCK=$cyrus_cv_sys_nonblock + +-echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5 +-echo "${ECHO_T}$WITH_NONBLOCK" >&6 ++{ echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5 ++echo "${ECHO_T}$WITH_NONBLOCK" >&6; } + +-echo "$as_me:$LINENO: checking timezone GMT offset method" >&5 +-echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking timezone GMT offset method" >&5 ++echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6; } + if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9973,24 +12581,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -9999,17 +12619,18 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-cyrus_cv_struct_sys_gmtoff=gmtime ++ cyrus_cv_struct_sys_gmtoff=gmtime + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff + +-echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5 +-echo "${ECHO_T}$WITH_GMTOFF" >&6 +-echo "$as_me:$LINENO: checking for shared mmap" >&5 +-echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5 ++echo "${ECHO_T}$WITH_GMTOFF" >&6; } ++{ echo "$as_me:$LINENO: checking for shared mmap" >&5 ++echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6; } + if test "${cyrus_cv_func_mmap_shared+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10049,13 +12670,22 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10068,17 +12698,19 @@ + ( exit $ac_status ) + cyrus_cv_func_mmap_shared=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi + +-echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5 +-echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6 ++{ echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5 ++echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6; } + if test $cyrus_cv_func_mmap_shared = yes; then + WITH_MAP="shared" + else +-echo "$as_me:$LINENO: checking for stupid shared mmap" >&5 +-echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for stupid shared mmap" >&5 ++echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6; } + if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10119,13 +12751,22 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10138,12 +12779,14 @@ + ( exit $ac_status ) + cyrus_cv_func_mmap_stupidshared=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi + +-echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5 +-echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6 ++{ echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5 ++echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6; } + if test $cyrus_cv_func_mmap_stupidshared = yes; then + WITH_MAP="stupidshared" + else +@@ -10157,14 +12800,13 @@ + + + +-# Check whether --with-lock or --without-lock was given. ++# Check whether --with-lock was given. + if test "${with_lock+set}" = set; then +- withval="$with_lock" +- WITH_LOCK="$withval" ++ withval=$with_lock; WITH_LOCK="$withval" + else + +- echo "$as_me:$LINENO: checking for fcntl" >&5 +-echo $ECHO_N "checking for fcntl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for fcntl" >&5 ++echo $ECHO_N "checking for fcntl... $ECHO_C" >&6; } + if test "${ac_cv_func_fcntl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10191,53 +12833,59 @@ + + #undef fcntl + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char fcntl (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_fcntl) || defined (__stub___fcntl) ++#if defined __stub_fcntl || defined __stub___fcntl + choke me +-#else +-char (*f) () = fcntl; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != fcntl; ++return fcntl (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10246,19 +12894,20 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_fcntl=no ++ ac_cv_func_fcntl=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5 +-echo "${ECHO_T}$ac_cv_func_fcntl" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5 ++echo "${ECHO_T}$ac_cv_func_fcntl" >&6; } + if test $ac_cv_func_fcntl = yes; then + WITH_LOCK="fcntl" + else + +- echo "$as_me:$LINENO: checking for flock" >&5 +-echo $ECHO_N "checking for flock... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for flock" >&5 ++echo $ECHO_N "checking for flock... $ECHO_C" >&6; } + if test "${ac_cv_func_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10285,53 +12934,59 @@ + + #undef flock + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char flock (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_flock) || defined (__stub___flock) ++#if defined __stub_flock || defined __stub___flock + choke me +-#else +-char (*f) () = flock; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != flock; ++return flock (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10340,13 +12995,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_flock=no ++ ac_cv_func_flock=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5 +-echo "${ECHO_T}$ac_cv_func_flock" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5 ++echo "${ECHO_T}$ac_cv_func_flock" >&6; } + if test $ac_cv_func_flock = yes; then + WITH_LOCK="flock" + else +@@ -10361,13 +13017,14 @@ + fi + + +-fi; ++fi ++ + + + + LIB_RT="" +-echo "$as_me:$LINENO: checking for fdatasync" >&5 +-echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for fdatasync" >&5 ++echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6; } + if test "${ac_cv_func_fdatasync+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10394,53 +13051,59 @@ + + #undef fdatasync + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char fdatasync (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_fdatasync) || defined (__stub___fdatasync) ++#if defined __stub_fdatasync || defined __stub___fdatasync + choke me +-#else +-char (*f) () = fdatasync; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != fdatasync; ++return fdatasync (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10449,13 +13112,14 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_fdatasync=no ++ ac_cv_func_fdatasync=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5 +-echo "${ECHO_T}$ac_cv_func_fdatasync" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5 ++echo "${ECHO_T}$ac_cv_func_fdatasync" >&6; } + if test $ac_cv_func_fdatasync = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -10464,8 +13128,8 @@ + + else + +- echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5 +-echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5 ++echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6; } + if test "${ac_cv_lib_rt_fdatasync+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10478,40 +13142,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char fdatasync (); + int + main () + { +-fdatasync (); ++return fdatasync (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10520,14 +13196,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_rt_fdatasync=no ++ ac_cv_lib_rt_fdatasync=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5 +-echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5 ++echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6; } + if test $ac_cv_lib_rt_fdatasync = yes; then + + LIB_RT="-lrt" +@@ -10548,8 +13225,8 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +- echo "$as_me:$LINENO: checking for sigvec" >&5 +-echo $ECHO_N "checking for sigvec... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sigvec" >&5 ++echo $ECHO_N "checking for sigvec... $ECHO_C" >&6; } + if test "${ac_cv_func_sigvec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10576,53 +13253,59 @@ + + #undef sigvec + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char sigvec (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_sigvec) || defined (__stub___sigvec) ++#if defined __stub_sigvec || defined __stub___sigvec + choke me +-#else +-char (*f) () = sigvec; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != sigvec; ++return sigvec (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10631,21 +13314,22 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_sigvec=no ++ ac_cv_func_sigvec=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5 +-echo "${ECHO_T}$ac_cv_func_sigvec" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5 ++echo "${ECHO_T}$ac_cv_func_sigvec" >&6; } + if test $ac_cv_func_sigvec = yes; then + + cyrus_sigveclib="" + + else + +- echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5 +-echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5 ++echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6; } + if test "${ac_cv_lib_BSD_sigvec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10658,40 +13342,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char sigvec (); + int + main () + { +-sigvec (); ++return sigvec (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10700,22 +13396,23 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_BSD_sigvec=no ++ ac_cv_lib_BSD_sigvec=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5 +-echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5 ++echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6; } + if test $ac_cv_lib_BSD_sigvec = yes; then + cyrus_sigveclib="-lBSD" + else + + SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS" +- echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5 +-echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5 ++echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6; } + if test "${ac_cv_lib_ucb_sigvec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10728,40 +13425,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char sigvec (); + int + main () + { +-sigvec (); ++return sigvec (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -10770,14 +13479,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_ucb_sigvec=no ++ ac_cv_lib_ucb_sigvec=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5 +-echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5 ++echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6; } + if test $ac_cv_lib_ucb_sigvec = yes; then + + cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb" +@@ -10800,34 +13510,34 @@ + # all authentication goes through SASL + + +-# Check whether --with-afs or --without-afs was given. ++# Check whether --with-afs was given. + if test "${with_afs+set}" = set; then +- withval="$with_afs" +- with_afs="${withval}" ++ withval=$with_afs; with_afs="${withval}" + else + with_afs="no" +-fi; ++fi + + +-# Check whether --with-ldap or --without-ldap was given. ++ ++# Check whether --with-ldap was given. + if test "${with_ldap+set}" = set; then +- withval="$with_ldap" +- with_ldap="${withval}" ++ withval=$with_ldap; with_ldap="${withval}" + else + with_ldap="no" +-fi; ++fi + +-# Check whether --enable-krb5afspts or --disable-krb5afspts was given. ++ ++# Check whether --enable-krb5afspts was given. + if test "${enable_krb5afspts+set}" = set; then +- enableval="$enable_krb5afspts" +- SASL_GSSAPI_LIBS_SET="yes" ++ enableval=$enable_krb5afspts; SASL_GSSAPI_LIBS_SET="yes" + + + cat >>confdefs.h <<\_ACEOF + #define AFSPTS_USE_KRB5 + _ACEOF + +-fi; ++fi ++ + + if test "x$with_afs" != "xno"; then + if test ! -d $with_afs; then +@@ -10856,8 +13566,8 @@ + + SAVE_LIBS="$LIBS" + LIBS="${with_afs}/lib/liblwp.a" +- echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5 +-echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5 ++echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -10874,30 +13584,42 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + cyrus_afs_sigvec="no" + + else +@@ -10905,12 +13627,13 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + cyrus_afs_sigvec="yes" + + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -10960,8 +13683,8 @@ + CPPFLAGS=$LDAP_CPPFLAGS + LDFLAGS=$LDAP_LDFLAGS + +- echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 +-echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 ++echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; } + if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10974,40 +13697,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char ldap_initialize (); + int + main () + { +-ldap_initialize (); ++return ldap_initialize (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11016,14 +13751,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_ldap_ldap_initialize=no ++ ac_cv_lib_ldap_ldap_initialize=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 +-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 ++echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; } + if test $ac_cv_lib_ldap_ldap_initialize = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -11052,46 +13788,46 @@ + fi + + SERVER_SUBDIRS="master imap" +-# Check whether --enable-server or --disable-server was given. ++# Check whether --enable-server was given. + if test "${enable_server+set}" = set; then +- enableval="$enable_server" +- if test "$enableval" = no; then ++ enableval=$enable_server; if test "$enableval" = no; then + SERVER_SUBDIRS="" + fi +-fi; ++fi ++ + + # We always output a server makefile (just because we can) + + +-# Check whether --with-krb or --without-krb was given. ++# Check whether --with-krb was given. + if test "${with_krb+set}" = set; then +- withval="$with_krb" +- with_krb="$withval" ++ withval=$with_krb; with_krb="$withval" + else + with_krb="no" +-fi; ++fi + + +-# Check whether --with-krbimpl or --without-krbimpl was given. ++ ++# Check whether --with-krbimpl was given. + if test "${with_krbimpl+set}" = set; then +- withval="$with_krbimpl" +- with_krbimpl="$withval" ++ withval=$with_krbimpl; with_krbimpl="$withval" + else + with_krbimpl="kth" +-fi; ++fi + +-# Check whether --enable-statickrb or --disable-statickrb was given. ++ ++# Check whether --enable-statickrb was given. + if test "${enable_statickrb+set}" = set; then +- enableval="$enable_statickrb" +- with_statickrb="yes" ++ enableval=$enable_statickrb; with_statickrb="yes" + else + with_statickrb="no" +-fi; ++fi + + + +-echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 +-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6 ++ ++{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 ++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; } + if test "${ac_cv_lib_resolv_res_search+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11104,40 +13840,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char res_search (); + int + main () + { +-res_search (); ++return res_search (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11146,14 +13894,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_resolv_res_search=no ++ ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 ++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; } + if test $ac_cv_lib_resolv_res_search = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBRESOLV 1 +@@ -11172,16 +13921,16 @@ + + if test "$with_krb" != "no"; then + +-# Check whether --with-krbdes or --without-krbdes was given. ++# Check whether --with-krbdes was given. + if test "${with_krbdes+set}" = set; then +- withval="$with_krbdes" +- with_krbdes="$withval" ++ withval=$with_krbdes; with_krbdes="$withval" + else + with_krbdes="yes" +-fi; ++fi ++ + if test "$with_krbdes" = "yes"; then +- echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5 +-echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5 ++echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6; } + if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11194,40 +13943,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char des_ecb_encrypt (); + int + main () + { +-des_ecb_encrypt (); ++return des_ecb_encrypt (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11236,14 +13997,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_des_des_ecb_encrypt=no ++ ac_cv_lib_des_des_ecb_encrypt=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5 +-echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6; } + if test $ac_cv_lib_des_des_ecb_encrypt = yes; then + if test "$with_statickrb" = "yes"; then + KRB_LIBS="$with_krb/lib/libdes.a" +@@ -11260,8 +14022,8 @@ + fi + + if test -d ${with_krb}; then +- echo "$as_me:$LINENO: checking for Kerberos includes" >&5 +-echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for Kerberos includes" >&5 ++echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6; } + if test "${cyrus_krbinclude+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11275,8 +14037,8 @@ + done + + fi +-echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5 +-echo "${ECHO_T}$cyrus_krbinclude" >&6 ++{ echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5 ++echo "${ECHO_T}$cyrus_krbinclude" >&6; } + + if test -n "${cyrus_krbinclude}"; then + CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}" +@@ -11299,17 +14061,17 @@ + + if test "$with_des" != no; then + if test "${ac_cv_header_krb_h+set}" = set; then +- echo "$as_me:$LINENO: checking for krb.h" >&5 +-echo $ECHO_N "checking for krb.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for krb.h" >&5 ++echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; } + if test "${ac_cv_header_krb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5 +-echo "${ECHO_T}$ac_cv_header_krb_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5 ++echo "${ECHO_T}$ac_cv_header_krb_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking krb.h usability" >&5 +-echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking krb.h usability" >&5 ++echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -11320,24 +14082,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11346,15 +14120,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking krb.h presence" >&5 +-echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking krb.h presence" >&5 ++echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -11363,8 +14138,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -11388,9 +14168,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -11414,32 +14195,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for krb.h" >&5 +-echo $ECHO_N "checking for krb.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for krb.h" >&5 ++echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; } + if test "${ac_cv_header_krb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_krb_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5 +-echo "${ECHO_T}$ac_cv_header_krb_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5 ++echo "${ECHO_T}$ac_cv_header_krb_h" >&6; } + + fi + if test $ac_cv_header_krb_h = yes; then + as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5 +-echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Lib+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5 ++echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6; } ++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11451,40 +14225,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char krb_mk_priv (); + int + main () + { +-krb_mk_priv (); ++return krb_mk_priv (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11493,14 +14279,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_Lib=no" ++ eval "$as_ac_Lib=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Lib'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + if test "$with_statickrb" = "yes"; then + KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a" +@@ -11539,11 +14327,11 @@ + + IMAP_PROGS="" + +-# Check whether --with-openssl or --without-openssl was given. ++# Check whether --with-openssl was given. + if test "${with_openssl+set}" = set; then +- withval="$with_openssl" +- with_openssl="${withval}" +-fi; ++ withval=$with_openssl; with_openssl="${withval}" ++fi ++ + + OPENSSL_INC= + OPENSSL_LIB= +@@ -11551,8 +14339,8 @@ + no) with_openssl="no";; + ""|yes) + LIB_RSAREF="" +- echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5 +-echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5 ++echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6; } + if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11565,40 +14353,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char RSAPublicEncrypt (); + int + main () + { +-RSAPublicEncrypt (); ++return RSAPublicEncrypt (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11607,14 +14407,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_rsaref_RSAPublicEncrypt=no ++ ac_cv_lib_rsaref_RSAPublicEncrypt=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5 +-echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; } + if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then + LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes + else +@@ -11623,8 +14424,8 @@ + + + with_openssl="yes" +- echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5 +-echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5 ++echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6; } + if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11637,40 +14438,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char BIO_accept (); + int + main () + { +-BIO_accept (); ++return BIO_accept (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11679,22 +14492,23 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_crypto_BIO_accept=no ++ ac_cv_lib_crypto_BIO_accept=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5 +-echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5 ++echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6; } + if test $ac_cv_lib_crypto_BIO_accept = yes; then + LIBS="-lcrypto $LIB_RSAREF ${LIBS}" + else + with_openssl="no" + fi + +- echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5 +-echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5 ++echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; } + if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11707,40 +14521,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char SSL_CTX_new (); + int + main () + { +-SSL_CTX_new (); ++return SSL_CTX_new (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11749,14 +14575,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_ssl_SSL_CTX_new=no ++ ac_cv_lib_ssl_SSL_CTX_new=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 +-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 ++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; } + if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then + LIBS="-lssl ${LIBS}" + else +@@ -11788,10 +14615,10 @@ + LIBS="${LIBS} -lssl -lcrypto";; + esac + +-echo "$as_me:$LINENO: checking for openssl" >&5 +-echo $ECHO_N "checking for openssl... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $with_openssl" >&5 +-echo "${ECHO_T}$with_openssl" >&6 ++{ echo "$as_me:$LINENO: checking for openssl" >&5 ++echo $ECHO_N "checking for openssl... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $with_openssl" >&5 ++echo "${ECHO_T}$with_openssl" >&6; } + + if test "$with_openssl" != "no"; then + +@@ -11817,12 +14644,12 @@ + + + +-# Check whether --with-egd-socket or --without-egd-socket was given. ++# Check whether --with-egd-socket was given. + if test "${with_egd_socket+set}" = set; then +- withval="$with_egd_socket" +- EGD_SOCKET="$withval" ++ withval=$with_egd_socket; EGD_SOCKET="$withval" ++ ++fi + +-fi; + if test -n "$EGD_SOCKET" ; then + + cat >>confdefs.h <<_ACEOF +@@ -11832,11 +14659,11 @@ + fi + + +-# Check whether --with-zephyr or --without-zephyr was given. ++# Check whether --with-zephyr was given. + if test "${with_zephyr+set}" = set; then +- withval="$with_zephyr" +- with_zephyr="${withval}" +-fi; ++ withval=$with_zephyr; with_zephyr="${withval}" ++fi ++ + if test -z "$with_zephyr"; then + if test -f /usr/local/lib/libzephyr.a; then + with_zephyr="/usr/local" +@@ -11848,8 +14675,8 @@ + ZEPHYR_CPPFLAGS="" + case "$with_zephyr" in + no) true;; +- ""|yes) echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5 +-echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6 ++ ""|yes) { echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5 ++echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6; } + if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11862,40 +14689,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char ZInitialize (); + int + main () + { +-ZInitialize (); ++return ZInitialize (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -11904,14 +14743,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_zephyr_ZInitialize=no ++ ac_cv_lib_zephyr_ZInitialize=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5 +-echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5 ++echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6; } + if test $ac_cv_lib_zephyr_ZInitialize = yes; then + ZEPHYR_LIBS="-lzephyr" + else +@@ -11936,13 +14776,13 @@ + fi + + +-# Check whether --with-pidfile or --without-pidfile was given. ++# Check whether --with-pidfile was given. + if test "${with_pidfile+set}" = set; then +- withval="$with_pidfile" +- MASTERPIDFILE="$withval" ++ withval=$with_pidfile; MASTERPIDFILE="$withval" + else + MASTERPIDFILE="/var/run/cyrus-master.pid" +-fi; ++fi ++ + MASTERPIDFILE="\"$MASTERPIDFILE\"" + + cat >>confdefs.h <<_ACEOF +@@ -11951,48 +14791,45 @@ + + + +-# Check whether --with-idle or --without-idle was given. ++# Check whether --with-idle was given. + if test "${with_idle+set}" = set; then +- withval="$with_idle" +- WITH_IDLE="${withval}" ++ withval=$with_idle; WITH_IDLE="${withval}" + else + WITH_IDLE="poll" +-fi; +- +-if test "$WITH_IDLE" = "idled"; then +- IMAP_PROGS="$IMAP_PROGS idled" + fi + ++ ++ + ENABLE_NNTP=no +-# Check whether --enable-nntp or --disable-nntp was given. ++# Check whether --enable-nntp was given. + if test "${enable_nntp+set}" = set; then +- enableval="$enable_nntp" +- ENABLE_NNTP=$enableval ++ enableval=$enable_nntp; ENABLE_NNTP=$enableval + if test "$ENABLE_NNTP" != no; then + IMAP_PROGS="$IMAP_PROGS nntpd fetchnews" + fi +-fi; ++fi + +-# Check whether --enable-murder or --disable-murder was given. ++ ++# Check whether --enable-murder was given. + if test "${enable_murder+set}" = set; then +- enableval="$enable_murder" +- if test "$enableval" != no; then ++ enableval=$enable_murder; if test "$enableval" != no; then + IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate" + fi +-fi; ++fi + + + + +-# Check whether --with-com_err or --without-com_err was given. ++ ++# Check whether --with-com_err was given. + if test "${with_com_err+set}" = set; then +- withval="$with_com_err" ++ withval=$with_com_err; ++fi + +-fi; + if test -z "$with_com_err"; then + # no value supplied +- echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5 +-echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5 ++echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6; } + if test "${ac_cv_lib_com_err_com_err+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12005,40 +14842,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char com_err (); + int + main () + { +-com_err (); ++return com_err (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -12047,14 +14896,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_com_err_com_err=no ++ ac_cv_lib_com_err_com_err=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 +-echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 ++echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6; } + if test $ac_cv_lib_com_err_com_err = yes; then + + # com_err is already in library path +@@ -12062,17 +14912,17 @@ + # can use system com_err + with_com_err="" + if test "${ac_cv_header_et_com_err_h+set}" = set; then +- echo "$as_me:$LINENO: checking for et/com_err.h" >&5 +-echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for et/com_err.h" >&5 ++echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; } + if test "${ac_cv_header_et_com_err_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5 +-echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5 ++echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking et/com_err.h usability" >&5 +-echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking et/com_err.h usability" >&5 ++echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -12083,24 +14933,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -12109,15 +14971,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking et/com_err.h presence" >&5 +-echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking et/com_err.h presence" >&5 ++echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -12126,8 +14989,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -12151,9 +15019,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -12177,25 +15046,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for et/com_err.h" >&5 +-echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for et/com_err.h" >&5 ++echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; } + if test "${ac_cv_header_et_com_err_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_et_com_err_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5 +-echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5 ++echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; } + + fi + if test $ac_cv_header_et_com_err_h = yes; then +@@ -12206,17 +15068,17 @@ + + else + if test "${ac_cv_header_com_err_h+set}" = set; then +- echo "$as_me:$LINENO: checking for com_err.h" >&5 +-echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for com_err.h" >&5 ++echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; } + if test "${ac_cv_header_com_err_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5 +-echo "${ECHO_T}$ac_cv_header_com_err_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5 ++echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking com_err.h usability" >&5 +-echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking com_err.h usability" >&5 ++echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -12227,24 +15089,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -12253,15 +15127,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking com_err.h presence" >&5 +-echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking com_err.h presence" >&5 ++echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -12270,8 +15145,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -12295,9 +15175,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -12321,25 +15202,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for com_err.h" >&5 +-echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for com_err.h" >&5 ++echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; } + if test "${ac_cv_header_com_err_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_com_err_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5 +-echo "${ECHO_T}$ac_cv_header_com_err_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5 ++echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; } + + fi + if test $ac_cv_header_com_err_h = yes; then +@@ -12356,8 +15230,8 @@ + + # Extract the first word of "compile_et", so it can be a program name with args. + set dummy compile_et; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_COMPILE_ET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12372,37 +15246,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et" + ;; + esac + fi + COMPILE_ET=$ac_cv_path_COMPILE_ET +- + if test -n "$COMPILE_ET"; then +- echo "$as_me:$LINENO: result: $COMPILE_ET" >&5 +-echo "${ECHO_T}$COMPILE_ET" >&6 ++ { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5 ++echo "${ECHO_T}$COMPILE_ET" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + ++ + else + + if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then + with_com_err="/usr/local" + # Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args. + set dummy /usr/local/bin/compile_et; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_COMPILE_ET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12417,34 +15292,35 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et" + ;; + esac + fi + COMPILE_ET=$ac_cv_path_COMPILE_ET +- + if test -n "$COMPILE_ET"; then +- echo "$as_me:$LINENO: result: $COMPILE_ET" >&5 +-echo "${ECHO_T}$COMPILE_ET" >&6 ++ { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5 ++echo "${ECHO_T}$COMPILE_ET" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then + with_com_err="/usr" + # Extract the first word of "/usr/bin/compile_et", so it can be a program name with args. + set dummy /usr/bin/compile_et; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_COMPILE_ET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12459,28 +15335,29 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et" + ;; + esac + fi + COMPILE_ET=$ac_cv_path_COMPILE_ET +- + if test -n "$COMPILE_ET"; then +- echo "$as_me:$LINENO: result: $COMPILE_ET" >&5 +-echo "${ECHO_T}$COMPILE_ET" >&6 ++ { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5 ++echo "${ECHO_T}$COMPILE_ET" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + else + # use ours + with_com_err=yes +@@ -12535,8 +15412,8 @@ + + + +-echo "$as_me:$LINENO: checking for modern syslog" >&5 +-echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for modern syslog" >&5 ++echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6; } + if test "${cyrus_cv_lib_syslog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12551,8 +15428,13 @@ + #include + #endif + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -12576,6 +15458,7 @@ + + cyrus_cv_lib_syslog=no + fi ++ + rm -f conftest.err conftest.$ac_ext + fi + +@@ -12585,35 +15468,35 @@ + DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a" + CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog" + fi +-echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5 +-echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6 ++{ echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5 ++echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6; } + +-echo "$as_me:$LINENO: checking which syslog facility to use" >&5 +-echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking which syslog facility to use" >&5 ++echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6; } + SYSLOG_FACILITY=LOG_LOCAL6 + +-# Check whether --with-syslogfacility or --without-syslogfacility was given. ++# Check whether --with-syslogfacility was given. + if test "${with_syslogfacility+set}" = set; then +- withval="$with_syslogfacility" +- if test "$withval" != "yes" -a "$withval" != "no" ; then ++ withval=$with_syslogfacility; if test "$withval" != "yes" -a "$withval" != "no" ; then + SYSLOG_FACILITY=LOG_$withval + fi; +-fi; ++fi ++ + + cat >>confdefs.h <<_ACEOF + #define SYSLOG_FACILITY $SYSLOG_FACILITY + _ACEOF + +-echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5 +-echo "${ECHO_T}$SYSLOG_FACILITY" >&6 ++{ echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5 ++echo "${ECHO_T}$SYSLOG_FACILITY" >&6; } + + + for ac_func in getdtablesize + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -12639,53 +15522,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -12694,88 +15583,88 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + else +- case $LIBOBJS in +- "$ac_func.$ac_objext" | \ +- *" $ac_func.$ac_objext" | \ +- "$ac_func.$ac_objext "* | \ ++ case " $LIBOBJS " in + *" $ac_func.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; ++ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ++ ;; + esac + + fi + done + + +-# Check whether --enable-cmulocal or --disable-cmulocal was given. ++# Check whether --enable-cmulocal was given. + if test "${enable_cmulocal+set}" = set; then +- enableval="$enable_cmulocal" +- if test "$enableval" = yes; then ++ enableval=$enable_cmulocal; if test "$enableval" = yes; then + EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot" + EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile" + fi +-fi; ++fi + +-echo "$as_me:$LINENO: checking to use old sieve service name" >&5 +-echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6 +-# Check whether --enable-oldsievename or --disable-oldsievename was given. ++ ++{ echo "$as_me:$LINENO: checking to use old sieve service name" >&5 ++echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6; } ++# Check whether --enable-oldsievename was given. + if test "${enable_oldsievename+set}" = set; then +- enableval="$enable_oldsievename" +- if test "$enableval" = yes; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ enableval=$enable_oldsievename; if test "$enableval" = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define OLD_SIEVE_SERVICE_NAME + _ACEOF + + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi; ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi + +-# Check whether --enable-listext or --disable-listext was given. ++ ++# Check whether --enable-listext was given. + if test "${enable_listext+set}" = set; then +- enableval="$enable_listext" +- if test "$enableval" = yes; then ++ enableval=$enable_listext; if test "$enableval" = yes; then + + cat >>confdefs.h <<\_ACEOF + #define ENABLE_LISTEXT + _ACEOF + + fi +-fi; ++fi + +-# Check whether --enable-netscapehack or --disable-netscapehack was given. ++ ++# Check whether --enable-netscapehack was given. + if test "${enable_netscapehack+set}" = set; then +- enableval="$enable_netscapehack" +- if test "$enableval" = yes; then ++ enableval=$enable_netscapehack; if test "$enableval" = yes; then + + cat >>confdefs.h <<\_ACEOF + #define ENABLE_X_NETSCAPE_HACK + _ACEOF + + fi +-fi; ++fi + +-echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 ++ ++{ echo "$as_me:$LINENO: checking for dlopen" >&5 ++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } + if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12802,53 +15691,59 @@ + + #undef dlopen + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) ++#if defined __stub_dlopen || defined __stub___dlopen + choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != dlopen; ++return dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -12857,19 +15752,20 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_dlopen=no ++ ac_cv_func_dlopen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } + if test $ac_cv_func_dlopen = yes; then + : + else + +-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12882,40 +15778,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); ++return dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -12924,14 +15832,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } + if test $ac_cv_lib_dl_dlopen = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBDL 1 +@@ -12943,8 +15852,8 @@ + + fi + +-echo "$as_me:$LINENO: checking for crypt" >&5 +-echo $ECHO_N "checking for crypt... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for crypt" >&5 ++echo $ECHO_N "checking for crypt... $ECHO_C" >&6; } + if test "${ac_cv_func_crypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12971,53 +15880,59 @@ + + #undef crypt + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char crypt (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_crypt) || defined (__stub___crypt) ++#if defined __stub_crypt || defined __stub___crypt + choke me +-#else +-char (*f) () = crypt; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != crypt; ++return crypt (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13026,18 +15941,19 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_crypt=no ++ ac_cv_func_crypt=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5 +-echo "${ECHO_T}$ac_cv_func_crypt" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5 ++echo "${ECHO_T}$ac_cv_func_crypt" >&6; } + if test $ac_cv_func_crypt = yes; then + cmu_have_crypt=yes + else +- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 ++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; } + if test "${ac_cv_lib_crypt_crypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13050,40 +15966,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char crypt (); + int + main () + { +-crypt (); ++return crypt (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13092,14 +16020,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_crypt_crypt=no ++ ac_cv_lib_crypt_crypt=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; } + if test $ac_cv_lib_crypt_crypt = yes; then + LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes + else +@@ -13112,21 +16041,21 @@ + + + +-# Check whether --enable-gssapi or --disable-gssapi was given. ++# Check whether --enable-gssapi was given. + if test "${enable_gssapi+set}" = set; then +- enableval="$enable_gssapi" +- gssapi=$enableval ++ enableval=$enable_gssapi; gssapi=$enableval + else + gssapi=yes +-fi; ++fi + +-# Check whether --with-gss_impl or --without-gss_impl was given. ++ ++# Check whether --with-gss_impl was given. + if test "${with_gss_impl+set}" = set; then +- withval="$with_gss_impl" +- gss_impl=$withval ++ withval=$with_gss_impl; gss_impl=$withval + else + gss_impl=auto +-fi; ++fi ++ + + if test "$gssapi" != no; then + platform= +@@ -13179,17 +16108,17 @@ + fi + fi + if test "${ac_cv_header_gssapi_h+set}" = set; then +- echo "$as_me:$LINENO: checking for gssapi.h" >&5 +-echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gssapi.h" >&5 ++echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; } + if test "${ac_cv_header_gssapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 ++echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking gssapi.h usability" >&5 +-echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking gssapi.h usability" >&5 ++echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13200,24 +16129,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13226,15 +16167,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking gssapi.h presence" >&5 +-echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking gssapi.h presence" >&5 ++echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13243,8 +16185,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -13268,9 +16215,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -13294,25 +16242,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for gssapi.h" >&5 +-echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for gssapi.h" >&5 ++echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; } + if test "${ac_cv_header_gssapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_gssapi_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 ++echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; } + + fi + if test $ac_cv_header_gssapi_h = yes; then +@@ -13323,17 +16264,17 @@ + + else + if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then +- echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5 +-echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5 ++echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; } + if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5 ++echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5 +-echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5 ++echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13344,24 +16285,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13370,15 +16323,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5 +-echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5 ++echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13387,8 +16341,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -13412,9 +16371,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -13438,25 +16398,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5 +-echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5 ++echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; } + if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_gssapi_gssapi_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5 +-echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5 ++echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; } + + fi + if test $ac_cv_header_gssapi_gssapi_h = yes; then +@@ -13485,8 +16438,8 @@ + # The choice is reflected in GSSAPIBASE_LIBS + + +-echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 +-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 ++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; } + if test "${ac_cv_lib_resolv_res_search+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13499,40 +16452,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char res_search (); + int + main () + { +-res_search (); ++return res_search (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13541,14 +16506,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_resolv_res_search=no ++ ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 ++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; } + if test $ac_cv_lib_resolv_res_search = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBRESOLV 1 +@@ -13575,8 +16541,8 @@ + + if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then + gss_failed=0 +- echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5 +-echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5 ++echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6; } + if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13589,40 +16555,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gss_unwrap (); + int + main () + { +-gss_unwrap (); ++return gss_unwrap (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13631,14 +16609,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_gssapi_gss_unwrap=no ++ ac_cv_lib_gssapi_gss_unwrap=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5 +-echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5 ++echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6; } + if test $ac_cv_lib_gssapi_gss_unwrap = yes; then + gss_impl="heimdal" + else +@@ -13651,14 +16630,97 @@ + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then ++ # check for libkrb5support first ++ { echo "$as_me:$LINENO: checking for krb5int_getspecific in -lkrb5support" >&5 ++echo $ECHO_N "checking for krb5int_getspecific in -lkrb5support... $ECHO_C" >&6; } ++if test "${ac_cv_lib_krb5support_krb5int_getspecific+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lkrb5support ${LIB_SOCKET} $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char krb5int_getspecific (); ++int ++main () ++{ ++return krb5int_getspecific (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { 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' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_krb5support_krb5int_getspecific=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_krb5support_krb5int_getspecific=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5 ++echo "${ECHO_T}$ac_cv_lib_krb5support_krb5int_getspecific" >&6; } ++if test $ac_cv_lib_krb5support_krb5int_getspecific = yes; then ++ K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a ++fi ++ ++ + gss_failed=0 +- echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5 +-echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5 ++echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6; } + if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET} $LIBS" ++LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13666,40 +16728,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gss_unwrap (); + int + main () + { +-gss_unwrap (); ++return gss_unwrap (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13708,14 +16782,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_gssapi_krb5_gss_unwrap=no ++ ac_cv_lib_gssapi_krb5_gss_unwrap=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5 +-echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5 ++echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; } + if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then + gss_impl="mit" + else +@@ -13747,8 +16822,8 @@ + # library (older CyberSafe) + + unset ac_cv_lib_gss_csf_gss_acq_user +- echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5 +-echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5 ++echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; } + if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13761,40 +16836,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char csf_gss_acq_user (); + int + main () + { +-csf_gss_acq_user (); ++return csf_gss_acq_user (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13803,20 +16890,21 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_gss_csf_gss_acq_user=no ++ ac_cv_lib_gss_csf_gss_acq_user=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5 +-echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5 ++echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; } + if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then + gss_impl="cybersafe03" + else + unset ac_cv_lib_gss_csf_gss_acq_user; +- echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5 +-echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5 ++echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; } + if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13829,40 +16917,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char csf_gss_acq_user (); + int + main () + { +-csf_gss_acq_user (); ++return csf_gss_acq_user (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13871,14 +16971,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_gss_csf_gss_acq_user=no ++ ac_cv_lib_gss_csf_gss_acq_user=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5 +-echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5 ++echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; } + if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then + gss_impl="cybersafe" + else +@@ -13901,8 +17002,8 @@ + + if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then + gss_failed=0 +- echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5 +-echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5 ++echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6; } + if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13915,40 +17016,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char gss_unwrap (); + int + main () + { +-gss_unwrap (); ++return gss_unwrap (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -13957,14 +17070,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_gss_gss_unwrap=no ++ ac_cv_lib_gss_gss_unwrap=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5 +-echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5 ++echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6; } + if test $ac_cv_lib_gss_gss_unwrap = yes; then + gss_impl="seam" + else +@@ -13977,8 +17091,8 @@ + fi + + if test "$gss_impl" = "mit"; then +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a" ++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}" ++ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" + elif test "$gss_impl" = "heimdal"; then + CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" + GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" +@@ -14155,13 +17269,13 @@ + fi + + GSSAPI_LIBS="" +-echo "$as_me:$LINENO: checking GSSAPI" >&5 +-echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking GSSAPI" >&5 ++echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6; } + if test "$gssapi" != no; then +- echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5 +-echo "${ECHO_T}with implementation ${gss_impl}" >&6 +- echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 +-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5 ++echo "${ECHO_T}with implementation ${gss_impl}" >&6; } ++ { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 ++echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; } + if test "${ac_cv_lib_resolv_res_search+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -14174,40 +17288,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char res_search (); + int + main () + { +-res_search (); ++return res_search (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -14216,14 +17342,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_resolv_res_search=no ++ ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 ++echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; } + if test $ac_cv_lib_resolv_res_search = yes; then + GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv" + fi +@@ -14238,9 +17365,9 @@ + for ac_func in gsskrb5_register_acceptor_identity + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -14266,53 +17393,59 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -14321,13 +17454,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -14338,8 +17473,8 @@ + + LIBS="$cmu_save_LIBS" + else +- echo "$as_me:$LINENO: result: disabled" >&5 +-echo "${ECHO_T}disabled" >&6 ++ { echo "$as_me:$LINENO: result: disabled" >&5 ++echo "${ECHO_T}disabled" >&6; } + fi + + +@@ -14347,25 +17482,25 @@ + + + +-# Check whether --with-sasl or --without-sasl was given. ++# Check whether --with-sasl was given. + if test "${with_sasl+set}" = set; then +- withval="$with_sasl" +- with_sasl="$withval" ++ withval=$with_sasl; with_sasl="$withval" + else + with_sasl="yes" +-fi; ++fi + + +-# Check whether --with-staticsasl or --without-staticsasl was given. ++ ++# Check whether --with-staticsasl was given. + if test "${with_staticsasl+set}" = set; then +- withval="$with_staticsasl" +- with_staticsasl="$withval"; ++ withval=$with_staticsasl; with_staticsasl="$withval"; + if test $with_staticsasl != "no"; then + using_static_sasl="static" + fi + else + with_staticsasl="no"; using_static_sasl="no" +-fi; ++fi ++ + + SASLFLAGS="" + LIB_SASL="" +@@ -14393,17 +17528,17 @@ + fi + + if test "${ac_cv_header_sasl_sasl_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 +-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 ++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_sasl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5 +-echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5 ++echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14414,24 +17549,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -14440,15 +17587,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5 +-echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5 ++echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14457,8 +17605,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -14482,9 +17635,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -14508,40 +17662,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 +-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 ++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_sasl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sasl_sasl_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; } + + fi + if test $ac_cv_header_sasl_sasl_h = yes; then + if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 +-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 ++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5 +-echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5 ++echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14552,24 +17699,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -14578,15 +17737,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5 +-echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5 ++echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14595,8 +17755,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -14620,9 +17785,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -14646,39 +17812,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 +-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 ++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sasl_saslutil_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; } + + fi + if test $ac_cv_header_sasl_saslutil_h = yes; then + for i42 in lib64 lib; do + if test -r ${with_staticsasl}/$i42/libsasl2.a; then + ac_cv_found_sasl=yes +- echo "$as_me:$LINENO: checking for static libsasl" >&5 +-echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for static libsasl" >&5 ++echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; } + LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a" + fi + done + if test ! "$ac_cv_found_sasl" = "yes"; then +- echo "$as_me:$LINENO: checking for static libsasl" >&5 +-echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for static libsasl" >&5 ++echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; } + { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5 + echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;} + { (exit 1); exit 1; }; } +@@ -14690,8 +17849,8 @@ + + + +- echo "$as_me:$LINENO: result: found" >&5 +-echo "${ECHO_T}found" >&6 ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + + if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then + LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS" +@@ -14723,17 +17882,17 @@ + + # be sure to check for a SASLv2 specific function + if test "${ac_cv_header_sasl_sasl_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 +-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 ++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_sasl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5 +-echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5 ++echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14744,24 +17903,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -14770,15 +17941,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5 +-echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5 ++echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14787,8 +17959,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -14812,9 +17989,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -14838,40 +18016,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 +-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5 ++echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_sasl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sasl_sasl_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; } + + fi + if test $ac_cv_header_sasl_sasl_h = yes; then + if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 +-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 ++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5 +-echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5 ++echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14882,24 +18053,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -14908,15 +18091,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5 +-echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5 ++echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14925,8 +18109,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -14950,9 +18139,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -14976,30 +18166,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 +-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5 ++echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sasl_saslutil_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 +-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; } + + fi + if test $ac_cv_header_sasl_saslutil_h = yes; then +- echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5 +-echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5 ++echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6; } + if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15012,40 +18195,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char prop_get (); + int + main () + { +-prop_get (); ++return prop_get (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15054,14 +18249,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_sasl2_prop_get=no ++ ac_cv_lib_sasl2_prop_get=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5 +-echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5 ++echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6; } + if test $ac_cv_lib_sasl2_prop_get = yes; then + ac_cv_found_sasl=yes + else +@@ -15152,8 +18348,13 @@ + #endif + + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -15179,6 +18380,7 @@ + echo "$as_me: error: Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." >&2;} + { (exit 1); exit 1; }; } + fi ++ + rm -f conftest.err conftest.$ac_ext + + CPPFLAGS=$cmu_saved_CPPFLAGS +@@ -15189,8 +18391,8 @@ + + LDFLAGS="$LDFLAGS $LIB_SASL" + +-echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5 +-echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5 ++echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6; } + if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15203,40 +18405,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char sasl_checkapop (); + int + main () + { +-sasl_checkapop (); ++return sasl_checkapop (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15245,14 +18459,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_sasl2_sasl_checkapop=no ++ ac_cv_lib_sasl2_sasl_checkapop=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5 +-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5 ++echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6; } + if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -15270,13 +18485,13 @@ + + + +-# Check whether --with-perl or --without-perl was given. ++# Check whether --with-perl was given. + if test "${with_perl+set}" = set; then +- withval="$with_perl" +- with_perl="$withval" ++ withval=$with_perl; with_perl="$withval" + else + with_perl="perl" +-fi; ++fi ++ + + if test "${with_perl}" = yes; then + with_perl="perl" +@@ -15291,8 +18506,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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_PERL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15305,25 +18520,27 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PERL="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + PERL=$ac_cv_prog_PERL + if test -n "$PERL"; then +- echo "$as_me:$LINENO: result: $PERL" >&5 +-echo "${ECHO_T}$PERL" >&6 ++ { echo "$as_me:$LINENO: result: $PERL" >&5 ++echo "${ECHO_T}$PERL" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$PERL" && break + done + test -n "$PERL" || PERL="with_perl=notfound" +@@ -15352,8 +18569,8 @@ + PERL_DEPSUBDIRS="none" + fi + +-echo "$as_me:$LINENO: checking for MD5Init" >&5 +-echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for MD5Init" >&5 ++echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6; } + if test "${ac_cv_func_MD5Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15380,53 +18597,59 @@ + + #undef MD5Init + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char MD5Init (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_MD5Init) || defined (__stub___MD5Init) ++#if defined __stub_MD5Init || defined __stub___MD5Init + choke me +-#else +-char (*f) () = MD5Init; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != MD5Init; ++return MD5Init (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15435,18 +18658,19 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_MD5Init=no ++ ac_cv_func_MD5Init=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5 +-echo "${ECHO_T}$ac_cv_func_MD5Init" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5 ++echo "${ECHO_T}$ac_cv_func_MD5Init" >&6; } + if test $ac_cv_func_MD5Init = yes; then + : + else +- echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5 +-echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5 ++echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6; } + if test "${ac_cv_lib_md_MD5Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15459,40 +18683,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char MD5Init (); + int + main () + { +-MD5Init (); ++return MD5Init (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15501,14 +18737,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_md_MD5Init=no ++ ac_cv_lib_md_MD5Init=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5 +-echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5 ++echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6; } + if test $ac_cv_lib_md_MD5Init = yes; then + LIBS="${LIBS} -lmd" + else +@@ -15523,13 +18760,13 @@ + + + +-# Check whether --with-lib-subdir or --without-lib-subdir was given. ++# Check whether --with-lib-subdir was given. + if test "${with_lib_subdir+set}" = set; then +- withval="$with_lib_subdir" ++ withval=$with_lib_subdir; ++fi + +-fi; +-echo "$as_me:$LINENO: checking for long" >&5 +-echo $ECHO_N "checking for long... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for long" >&5 ++echo $ECHO_N "checking for long... $ECHO_C" >&6; } + if test "${ac_cv_type_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15540,36 +18777,49 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++typedef long ac__type_new_; + int + main () + { +-if ((long *) 0) ++if ((ac__type_new_ *) 0) + return 0; +-if (sizeof (long)) ++if (sizeof (ac__type_new_)) + return 0; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15578,23 +18828,23 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_type_long=no ++ ac_cv_type_long=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +-echo "${ECHO_T}$ac_cv_type_long" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 ++echo "${ECHO_T}$ac_cv_type_long" >&6; } + +-echo "$as_me:$LINENO: checking size of long" >&5 +-echo $ECHO_N "checking size of long... $ECHO_C" >&6 ++# 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 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 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; + test_array [0] = 0 + + ; +@@ -15615,24 +18867,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15645,10 +18909,12 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; + test_array [0] = 0 + + ; +@@ -15656,24 +18922,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15682,30 +18960,33 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` ++ ac_lo=`expr $ac_mid + 1` ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid + 1` + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; + test_array [0] = 0 + + ; +@@ -15713,24 +18994,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15743,10 +19036,12 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; + test_array [0] = 0 + + ; +@@ -15754,24 +19049,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15780,24 +19087,27 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` ++ ac_hi=`expr '(' $ac_mid ')' - 1` ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid` + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_lo= ac_hi= ++ ac_lo= ac_hi= + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # 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 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++ typedef long ac__type_sizeof_; ++ + int + main () + { +-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; ++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; + test_array [0] = 0 + + ; +@@ -15819,24 +19131,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15845,26 +19169,24 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_lo=`expr '(' $ac_mid ')' + 1` ++ ac_lo=`expr '(' $ac_mid ')' + 1` + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + case $ac_lo in + ?*) 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) + 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 ;; + esac + else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -15872,8 +19194,10 @@ + 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_; ++ ++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } ++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } + #include + #include + int +@@ -15882,35 +19206,44 @@ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) +- exit (1); +- if (((long) (sizeof (long))) < 0) ++ return 1; ++ if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { +- long i = longval (); +- if (i != ((long) (sizeof (long)))) +- exit (1); ++ long int i = longval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; + fprintf (f, "%ld\n", i); + } + else + { +- unsigned long i = ulongval (); +- if (i != ((long) (sizeof (long)))) +- exit (1); ++ unsigned long int i = ulongval (); ++ if (i != ((long int) (sizeof (ac__type_sizeof_)))) ++ return 1; + fprintf (f, "%lu\n", i); + } +- exit (ferror (f) || fclose (f) != 0); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -15921,29 +19254,32 @@ + 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) + 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; }; } +-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 + 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 + + +-echo "$as_me:$LINENO: checking what directory libraries are found in" >&5 +-echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking what directory libraries are found in" >&5 ++echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6; } + if test "${ac_cv_cmu_lib_subdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15961,8 +19297,8 @@ + ac_cv_cmu_lib_subdir=$with_lib_subdir + fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5 +-echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5 ++echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6; } + CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir + + +@@ -15970,21 +19306,21 @@ + + + +-# Check whether --with-libwrap or --without-libwrap was given. ++# Check whether --with-libwrap was given. + if test "${with_libwrap+set}" = set; then +- withval="$with_libwrap" +- with_libwrap=$withval ++ withval=$with_libwrap; with_libwrap=$withval + else + with_libwrap=yes +-fi; ++fi ++ + if test "$with_libwrap" != no; then + if test -d "$with_libwrap"; then + CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include" + LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR" + fi + cmu_save_LIBS="$LIBS" +- echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5 +-echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5 ++echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6; } + if test "${ac_cv_lib_wrap_request_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15997,40 +19333,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char request_init (); + int + main () + { +-request_init (); ++return request_init (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -16039,28 +19387,29 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_wrap_request_init=no ++ ac_cv_lib_wrap_request_init=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5 +-echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5 ++echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6; } + if test $ac_cv_lib_wrap_request_init = yes; then + + if test "${ac_cv_header_tcpd_h+set}" = set; then +- echo "$as_me:$LINENO: checking for tcpd.h" >&5 +-echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for tcpd.h" >&5 ++echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tcpd_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5 +-echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking tcpd.h usability" >&5 +-echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking tcpd.h usability" >&5 ++echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -16071,24 +19420,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -16097,15 +19458,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking tcpd.h presence" >&5 +-echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking tcpd.h presence" >&5 ++echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -16114,8 +19476,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -16139,9 +19506,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -16165,25 +19533,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for tcpd.h" >&5 +-echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for tcpd.h" >&5 ++echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tcpd_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tcpd_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5 +-echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; } + + fi + if test $ac_cv_header_tcpd_h = yes; then +@@ -16199,10 +19560,10 @@ + + LIBS="$cmu_save_LIBS" + fi +- echo "$as_me:$LINENO: checking libwrap support" >&5 +-echo $ECHO_N "checking libwrap support... $ECHO_C" >&6 +- echo "$as_me:$LINENO: result: $with_libwrap" >&5 +-echo "${ECHO_T}$with_libwrap" >&6 ++ { echo "$as_me:$LINENO: checking libwrap support" >&5 ++echo $ECHO_N "checking libwrap support... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $with_libwrap" >&5 ++echo "${ECHO_T}$with_libwrap" >&6; } + LIB_WRAP="" + if test "$with_libwrap" != no; then + +@@ -16211,8 +19572,8 @@ + _ACEOF + + LIB_WRAP="-lwrap" +- echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 +-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 ++echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -16225,40 +19586,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char yp_get_default_domain (); + int + main () + { +-yp_get_default_domain (); ++return yp_get_default_domain (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -16267,14 +19640,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_nsl_yp_get_default_domain=no ++ ac_cv_lib_nsl_yp_get_default_domain=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 +-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 ++echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; } + if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then + LIB_WRAP="${LIB_WRAP} -lnsl" + fi +@@ -16286,28 +19660,28 @@ + + + +-# Check whether --with-snmp or --without-snmp was given. ++# Check whether --with-snmp was given. + if test "${with_snmp+set}" = set; then +- withval="$with_snmp" +- with_snmp=$withval ++ withval=$with_snmp; with_snmp=$withval + else + with_snmp=yes +-fi; ++fi + + +-# Check whether --with-ucdsnmp or --without-ucdsnmp was given. ++ ++# Check whether --with-ucdsnmp was given. + if test "${with_ucdsnmp+set}" = set; then +- withval="$with_ucdsnmp" +- with_snmp=$withval +-fi; ++ withval=$with_ucdsnmp; with_snmp=$withval ++fi ++ + + if test "$with_snmp" != "no"; then + + if test "$with_snmp" = "yes"; then + # Extract the first word of "net-snmp-config", so it can be a program name with args. + set dummy net-snmp-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -16323,34 +19697,35 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + ;; + esac + fi + SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG +- + if test -n "$SNMP_CONFIG"; then +- echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5 +-echo "${ECHO_T}$SNMP_CONFIG" >&6 ++ { echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5 ++echo "${ECHO_T}$SNMP_CONFIG" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + else + SNMP_CONFIG="$with_snmp/bin/net-snmp-config" + fi + + if test -x "$SNMP_CONFIG"; then +- echo "$as_me:$LINENO: checking NET SNMP libraries" >&5 +-echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking NET SNMP libraries" >&5 ++echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6; } + + SNMP_LIBS=`$SNMP_CONFIG --agent-libs` + SNMP_PREFIX=`$SNMP_CONFIG --prefix` +@@ -16364,11 +19739,11 @@ + _ACEOF + + +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5 + echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;} + fi +@@ -16379,8 +19754,8 @@ + LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR" + fi + cmu_save_LIBS="$LIBS" +- echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5 +-echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5 ++echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6; } + if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -16393,40 +19768,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char sprint_objid (); + int + main () + { +-sprint_objid (); ++return sprint_objid (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -16435,28 +19822,29 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_snmp_sprint_objid=no ++ ac_cv_lib_snmp_sprint_objid=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5 +-echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5 ++echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6; } + if test $ac_cv_lib_snmp_sprint_objid = yes; then + + if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then +- echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5 +-echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5 ++echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; } + if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5 +-echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5 ++echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5 +-echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5 ++echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -16467,24 +19855,36 @@ + #include + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='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;; ++ *) 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_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -16493,15 +19893,16 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5 +-echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5 ++echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -16510,8 +19911,13 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -16535,9 +19941,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -16561,25 +19968,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;} +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ + ;; + esac +-echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5 +-echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5 ++echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; } + if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_ucd_snmp_version_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5 +-echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5 ++echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; } + + fi + if test $ac_cv_header_ucd_snmp_version_h = yes; then +@@ -16595,10 +19995,10 @@ + + LIBS="$cmu_save_LIBS" + fi +- echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5 +-echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6 +- echo "$as_me:$LINENO: result: $with_snmp" >&5 +-echo "${ECHO_T}$with_snmp" >&6 ++ { echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5 ++echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $with_snmp" >&5 ++echo "${ECHO_T}$with_snmp" >&6; } + LIB_UCDSNMP="" + if test "$with_snmp" != no; then + +@@ -16607,8 +20007,8 @@ + _ACEOF + + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" +- echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 +-echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 ++echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6; } + if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -16621,40 +20021,52 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char rpmdbOpen (); + int + main () + { +-rpmdbOpen (); ++return rpmdbOpen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++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_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 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -16663,14 +20075,15 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_rpm_rpmdbOpen=no ++ ac_cv_lib_rpm_rpmdbOpen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5 +-echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5 ++echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6; } + if test $ac_cv_lib_rpm_rpmdbOpen = yes; then + LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt" + fi +@@ -16729,7 +20142,8 @@ + + + +- ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile" ++ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile" ++ + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -16748,39 +20162,58 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} | ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -16789,32 +20222,18 @@ + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/; +-s/:*\${srcdir}:*/:/; +-s/:*@srcdir@:*/:/; +-s/^\([^=]*=[ ]*\):*/\1/; +-s/:*$//; +-s/^[^=]*=[ ]*$//; +-}' +-fi +- + DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. +- ac_i=`echo "$ac_i" | +- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +- # 2. Add them. +- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -16852,11 +20271,35 @@ + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 + DUALCASE=1; export DUALCASE # for MKS sh + ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +@@ -16865,8 +20308,43 @@ + fi + + ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ + # Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done + PS1='$ ' + PS2='> ' + PS4='+ ' +@@ -16880,18 +20358,19 @@ + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else +- $as_unset $as_var ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi + done + + # Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false +@@ -16899,159 +20378,120 @@ + + + # Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- +- +-# PATH needs CR, and LINENO needs CR and PATH. +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi ++# CDPATH. ++$as_unset CDPATH + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done + +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + + +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- else +- as_ln_s='ln -s' +- fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +@@ -17060,7 +20500,19 @@ + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++# Find out whether ``test -x'' works. Don't use a zero-byte file, as ++# systems may use methods other than mode bits to determine executability. ++cat >conf$$.file <<_ASEOF ++#! /bin/sh ++exit 0 ++_ASEOF ++chmod +x conf$$.file ++if test -x conf$$.file >/dev/null 2>&1; then ++ as_executable_p="test -x" ++else ++ as_executable_p=: ++fi ++rm -f conf$$.file + + # 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 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- + exec 6>&1 + +-# Open the log real soon, to keep \$[0] and so on meaningful, and to ++# Save the log message, to keep $[0] and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. Logging --version etc. is OK. +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +-} >&5 +-cat >&5 <<_CSEOF +- ++# values after options handling. ++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 + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -17101,30 +20536,19 @@ + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +-_CSEOF +-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +-echo >&5 ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ + _ACEOF + ++cat >>$CONFIG_STATUS <<_ACEOF + # Files that config.status was made for. +-if test -n "$ac_config_files"; then +- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_headers"; then +- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_links"; then +- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +-fi ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" + +-if test -n "$ac_config_commands"; then +- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +-fi ++_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +- + 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 @@ + $config_headers + + Report bugs to ." +-_ACEOF + ++_ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.59, +- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.60a, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 2006 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." +-srcdir=$srcdir +-INSTALL="$INSTALL" ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -17171,39 +20597,24 @@ + do + case $1 in + --*=*) +- ac_option=`expr "x$1" : 'x\([^=]*\)='` +- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; +- -*) ++ *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; +- *) # This is not an option, so the user has probably given explicit +- # arguments. +- ac_option=$1 +- ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; +- --version | --vers* | -V ) +- echo "$ac_cs_version"; exit 0 ;; +- --he | --h) +- # Conflict between --help and --header +- { { echo "$as_me:$LINENO: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; };; +- --help | --hel | -h ) +- echo "$ac_cs_usage"; exit 0 ;; +- --debug | --d* | -d ) ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ echo "$ac_cs_version"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +@@ -17213,18 +20624,24 @@ + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ { echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2;} ++ -*) { echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +- *) ac_config_targets="$ac_config_targets $1" ;; ++ *) ac_config_targets="$ac_config_targets $1" ++ ac_need_defaults=false ;; + + esac + shift +@@ -17240,37 +20657,51 @@ + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + if \$ac_cs_recheck; then +- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL ++ export CONFIG_SHELL ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + fi + + _ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ echo "$ac_log" ++} >&5 + +- +- +- ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# Handling of arguments. + for ac_config_target in $ac_config_targets + do +- case "$ac_config_target" in +- # Handling of arguments. +- "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; +- "master/Makefile" ) CONFIG_FILES="$CONFIG_FILES master/Makefile" ;; +- "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; +- "imap/Makefile" ) CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;; +- "imtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;; +- "netnews/Makefile" ) CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;; +- "perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;; +- "$EXTRA_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;; +- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; ++ "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;; ++ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; ++ "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;; ++ "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;; ++ "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;; ++ "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;; ++ "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac + done + ++ + # If the user did not use the arguments to specify the items to instantiate, + # then the envvar interface is used. Set only those that are not. + # We use the long form for the default assignment because of an extremely +@@ -17281,626 +20712,621 @@ + fi + + # Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason to put it here, and in addition, ++# simply because there is no reason against having it here, and in addition, + # creating and moving files from /tmp can sometimes cause problems. +-# Create a temporary directory, and hook for its removal unless debugging. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 + } +- + # Create a (secure) tmp directory for tmp files. + + { +- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { +- tmp=./confstat$$-$RANDOM +- (umask 077 && mkdir $tmp) ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") + } || + { + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-_ACEOF +- +-cat >>$CONFIG_STATUS <<_ACEOF +- + # +-# CONFIG_FILES section. ++# Set up the sed scripts for CONFIG_FILES section. + # + + # No need to generate the scripts if there are no CONFIG_FILES. + # This happens for instance when ./config.status config.h +-if test -n "\$CONFIG_FILES"; then +- # Protect against being on the right side of a sed subst in config.status. +- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +-s,@SHELL@,$SHELL,;t t +-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +-s,@exec_prefix@,$exec_prefix,;t t +-s,@prefix@,$prefix,;t t +-s,@program_transform_name@,$program_transform_name,;t t +-s,@bindir@,$bindir,;t t +-s,@sbindir@,$sbindir,;t t +-s,@libexecdir@,$libexecdir,;t t +-s,@datadir@,$datadir,;t t +-s,@sysconfdir@,$sysconfdir,;t t +-s,@sharedstatedir@,$sharedstatedir,;t t +-s,@localstatedir@,$localstatedir,;t t +-s,@libdir@,$libdir,;t t +-s,@includedir@,$includedir,;t t +-s,@oldincludedir@,$oldincludedir,;t t +-s,@infodir@,$infodir,;t t +-s,@mandir@,$mandir,;t t +-s,@build_alias@,$build_alias,;t t +-s,@host_alias@,$host_alias,;t t +-s,@target_alias@,$target_alias,;t t +-s,@DEFS@,$DEFS,;t t +-s,@ECHO_C@,$ECHO_C,;t t +-s,@ECHO_N@,$ECHO_N,;t t +-s,@ECHO_T@,$ECHO_T,;t t +-s,@LIBS@,$LIBS,;t t +-s,@build@,$build,;t t +-s,@build_cpu@,$build_cpu,;t t +-s,@build_vendor@,$build_vendor,;t t +-s,@build_os@,$build_os,;t t +-s,@host@,$host,;t t +-s,@host_cpu@,$host_cpu,;t t +-s,@host_vendor@,$host_vendor,;t t +-s,@host_os@,$host_os,;t t +-s,@MAKEDEPEND@,$MAKEDEPEND,;t t +-s,@cyrus_prefix@,$cyrus_prefix,;t t +-s,@service_path@,$service_path,;t t +-s,@cyrus_user@,$cyrus_user,;t t +-s,@cyrus_group@,$cyrus_group,;t t +-s,@CC@,$CC,;t t +-s,@CFLAGS@,$CFLAGS,;t t +-s,@LDFLAGS@,$LDFLAGS,;t t +-s,@CPPFLAGS@,$CPPFLAGS,;t t +-s,@ac_ct_CC@,$ac_ct_CC,;t t +-s,@EXEEXT@,$EXEEXT,;t t +-s,@OBJEXT@,$OBJEXT,;t t +-s,@RANLIB@,$RANLIB,;t t +-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +-s,@SET_MAKE@,$SET_MAKE,;t t +-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +-s,@INSTALL_DATA@,$INSTALL_DATA,;t t +-s,@CPP@,$CPP,;t t +-s,@EGREP@,$EGREP,;t t +-s,@AWK@,$AWK,;t t +-s,@LIBOBJS@,$LIBOBJS,;t t +-s,@LIB_SOCKET@,$LIB_SOCKET,;t t +-s,@IPV6_OBJS@,$IPV6_OBJS,;t t +-s,@PRE_SUBDIRS@,$PRE_SUBDIRS,;t t +-s,@EXTRA_SUBDIRS@,$EXTRA_SUBDIRS,;t t +-s,@DEPLIBS@,$DEPLIBS,;t t +-s,@LOCALDEFS@,$LOCALDEFS,;t t +-s,@BDB_INC@,$BDB_INC,;t t +-s,@BDB_LIB@,$BDB_LIB,;t t +-s,@CYRUSDB_OBJS@,$CYRUSDB_OBJS,;t t +-s,@SIEVE_OBJS@,$SIEVE_OBJS,;t t +-s,@SIEVE_LIBS@,$SIEVE_LIBS,;t t +-s,@SIEVE_CPPFLAGS@,$SIEVE_CPPFLAGS,;t t +-s,@YACC@,$YACC,;t t +-s,@LEX@,$LEX,;t t +-s,@LEXLIB@,$LEXLIB,;t t +-s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t +-s,@SIEVE_SUBDIRS@,$SIEVE_SUBDIRS,;t t +-s,@WITH_NONBLOCK@,$WITH_NONBLOCK,;t t +-s,@WITH_GMTOFF@,$WITH_GMTOFF,;t t +-s,@WITH_MAP@,$WITH_MAP,;t t +-s,@WITH_LOCK@,$WITH_LOCK,;t t +-s,@cyrus_sigveclib@,$cyrus_sigveclib,;t t +-s,@AFS_LIBS@,$AFS_LIBS,;t t +-s,@AFS_LDFLAGS@,$AFS_LDFLAGS,;t t +-s,@LDAP_CPPFLAGS@,$LDAP_CPPFLAGS,;t t +-s,@LDAP_LDFLAGS@,$LDAP_LDFLAGS,;t t +-s,@LDAP_LIBS@,$LDAP_LIBS,;t t +-s,@SERVER_SUBDIRS@,$SERVER_SUBDIRS,;t t +-s,@OPENSSL_INC@,$OPENSSL_INC,;t t +-s,@OPENSSL_LIB@,$OPENSSL_LIB,;t t +-s,@ZEPHYR_LIBS@,$ZEPHYR_LIBS,;t t +-s,@ZEPHYR_CPPFLAGS@,$ZEPHYR_CPPFLAGS,;t t +-s,@WITH_IDLE@,$WITH_IDLE,;t t +-s,@IMAP_PROGS@,$IMAP_PROGS,;t t +-s,@COMPILE_ET@,$COMPILE_ET,;t t +-s,@COM_ERR_LIBS@,$COM_ERR_LIBS,;t t +-s,@COM_ERR_LDFLAGS@,$COM_ERR_LDFLAGS,;t t +-s,@COM_ERR_CPPFLAGS@,$COM_ERR_CPPFLAGS,;t t +-s,@LIB_CRYPT@,$LIB_CRYPT,;t t +-s,@GSSAPI_LIBS@,$GSSAPI_LIBS,;t t +-s,@GSSAPIBASE_LIBS@,$GSSAPIBASE_LIBS,;t t +-s,@LIB_DYN_SASL@,$LIB_DYN_SASL,;t t +-s,@DYNSASLFLAGS@,$DYNSASLFLAGS,;t t +-s,@LIB_SASL@,$LIB_SASL,;t t +-s,@SASLFLAGS@,$SASLFLAGS,;t t +-s,@PERL@,$PERL,;t t +-s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t +-s,@MD5OBJ@,$MD5OBJ,;t t +-s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t +-s,@CMU_LIB_SUBDIR@,$CMU_LIB_SUBDIR,;t t +-s,@LIB_WRAP@,$LIB_WRAP,;t t +-s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t +-s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t +-s,@LIB_RT@,$LIB_RT,;t t +-s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t +-s,@IMAP_LIBS@,$IMAP_LIBS,;t t +-s,@PERL_SUBDIRS@,$PERL_SUBDIRS,;t t +-s,@PERL_DEPSUBDIRS@,$PERL_DEPSUBDIRS,;t t +-s,@LTLIBOBJS@,$LTLIBOBJS,;t t +-CEOF ++if test -n "$CONFIG_FILES"; then + + _ACEOF + +- cat >>$CONFIG_STATUS <<\_ACEOF +- # Split the substitutions into bite-sized pieces for seds with +- # small command number limits, like on Digital OSF/1 and HP-UX. +- ac_max_sed_lines=48 +- ac_sed_frag=1 # Number of current file. +- ac_beg=1 # First line for current file. +- ac_end=$ac_max_sed_lines # Line after last line for current file. +- ac_more_lines=: +- ac_sed_cmds= +- while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- else +- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- fi +- if test ! -s $tmp/subs.frag; then +- ac_more_lines=false +- else +- # The purpose of the label and of the branching condition is to +- # speed up the sed processing (if there are no `@' at all, there +- # is no need to browse any of the substitutions). +- # These are the two extra sed commands mentioned above. +- (echo ':t +- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +- fi +- ac_sed_frag=`expr $ac_sed_frag + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_lines` +- fi +- done +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++WARNERROR!$WARNERROR$ac_delim ++MAKEDEPEND!$MAKEDEPEND$ac_delim ++cyrus_prefix!$cyrus_prefix$ac_delim ++service_path!$service_path$ac_delim ++cyrus_user!$cyrus_user$ac_delim ++cyrus_group!$cyrus_group$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++RANLIB!$RANLIB$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++CPP!$CPP$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim ++AWK!$AWK$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim ++LIB_SOCKET!$LIB_SOCKET$ac_delim ++IPV6_OBJS!$IPV6_OBJS$ac_delim ++PRE_SUBDIRS!$PRE_SUBDIRS$ac_delim ++EXTRA_SUBDIRS!$EXTRA_SUBDIRS$ac_delim ++DEPLIBS!$DEPLIBS$ac_delim ++LOCALDEFS!$LOCALDEFS$ac_delim ++BDB_INC!$BDB_INC$ac_delim ++BDB_LIB!$BDB_LIB$ac_delim ++CYRUSDB_OBJS!$CYRUSDB_OBJS$ac_delim ++SIEVE_OBJS!$SIEVE_OBJS$ac_delim ++SIEVE_LIBS!$SIEVE_LIBS$ac_delim ++SIEVE_CPPFLAGS!$SIEVE_CPPFLAGS$ac_delim ++YACC!$YACC$ac_delim ++YFLAGS!$YFLAGS$ac_delim ++LEX!$LEX$ac_delim ++LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim ++LEXLIB!$LEXLIB$ac_delim ++SIEVE_SUBDIRS!$SIEVE_SUBDIRS$ac_delim ++WITH_NONBLOCK!$WITH_NONBLOCK$ac_delim ++WITH_GMTOFF!$WITH_GMTOFF$ac_delim ++WITH_MAP!$WITH_MAP$ac_delim ++WITH_LOCK!$WITH_LOCK$ac_delim ++cyrus_sigveclib!$cyrus_sigveclib$ac_delim ++AFS_LIBS!$AFS_LIBS$ac_delim ++AFS_LDFLAGS!$AFS_LDFLAGS$ac_delim ++LDAP_CPPFLAGS!$LDAP_CPPFLAGS$ac_delim ++LDAP_LDFLAGS!$LDAP_LDFLAGS$ac_delim ++LDAP_LIBS!$LDAP_LIBS$ac_delim ++SERVER_SUBDIRS!$SERVER_SUBDIRS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +-fi # test -n "$CONFIG_FILES" ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi + ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b + _ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++OPENSSL_INC!$OPENSSL_INC$ac_delim ++OPENSSL_LIB!$OPENSSL_LIB$ac_delim ++ZEPHYR_LIBS!$ZEPHYR_LIBS$ac_delim ++ZEPHYR_CPPFLAGS!$ZEPHYR_CPPFLAGS$ac_delim ++WITH_IDLE!$WITH_IDLE$ac_delim ++IMAP_PROGS!$IMAP_PROGS$ac_delim ++COMPILE_ET!$COMPILE_ET$ac_delim ++COM_ERR_LIBS!$COM_ERR_LIBS$ac_delim ++COM_ERR_LDFLAGS!$COM_ERR_LDFLAGS$ac_delim ++COM_ERR_CPPFLAGS!$COM_ERR_CPPFLAGS$ac_delim ++LIB_CRYPT!$LIB_CRYPT$ac_delim ++GSSAPI_LIBS!$GSSAPI_LIBS$ac_delim ++GSSAPIBASE_LIBS!$GSSAPIBASE_LIBS$ac_delim ++LIB_DYN_SASL!$LIB_DYN_SASL$ac_delim ++DYNSASLFLAGS!$DYNSASLFLAGS$ac_delim ++LIB_SASL!$LIB_SASL$ac_delim ++SASLFLAGS!$SASLFLAGS$ac_delim ++PERL!$PERL$ac_delim ++PERL_CCCDLFLAGS!$PERL_CCCDLFLAGS$ac_delim ++MD5OBJ!$MD5OBJ$ac_delim ++SNMP_SUBDIRS!$SNMP_SUBDIRS$ac_delim ++CMU_LIB_SUBDIR!$CMU_LIB_SUBDIR$ac_delim ++LIB_WRAP!$LIB_WRAP$ac_delim ++SNMP_CONFIG!$SNMP_CONFIG$ac_delim ++LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim ++LIB_RT!$LIB_RT$ac_delim ++IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim ++IMAP_LIBS!$IMAP_LIBS$ac_delim ++PERL_SUBDIRS!$PERL_SUBDIRS$ac_delim ++PERL_DEPSUBDIRS!$PERL_DEPSUBDIRS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof ++_ACEOF ++ ++ ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ + cat >>$CONFIG_STATUS <<\_ACEOF +-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++fi # test -n "$CONFIG_FILES" ++ ++ ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ { (exit 1); exit 1; }; };; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift + +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++ ac_file_inputs="$ac_file_inputs $ac_f" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ fi ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin";; ++ esac ++ ;; ++ esac ++ ++ ac_dir=`$as_dirname -- "$ac_file" || + $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || + echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir="$ac_dir" ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break + done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- + ac_builddir=. + +-if test "$ac_dir" != .; then ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac + ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++_ACEOF + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- configure_input= +- else +- configure_input="$ac_file. " +- fi +- configure_input=$configure_input"Generated from `echo $ac_file_in | +- sed 's,.*/,,'` by configure." ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= + +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } ++case `sed -n '/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p ++' $ac_file_inputs` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@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 ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac ++_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 + sed "$ac_vpsub + $extrasub + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s,@configure_input@,$configure_input,;t t +-s,@srcdir@,$ac_srcdir,;t t +-s,@abs_srcdir@,$ac_abs_srcdir,;t t +-s,@top_srcdir@,$ac_top_srcdir,;t t +-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +-s,@builddir@,$ac_builddir,;t t +-s,@abs_builddir@,$ac_abs_builddir,;t t +-s,@top_builddir@,$ac_top_builddir,;t t +-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +-s,@INSTALL@,$ac_INSTALL,;t t +-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +- rm -f $tmp/stdin +- if test x"$ac_file" != x-; then +- mv $tmp/out $ac_file +- else +- cat $tmp/out +- rm -f $tmp/out +- fi +- +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# ++s&@configure_input@&$configure_input&;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++$ac_datarootdir_hack ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='[ ].*$,\1#\2' +-ac_dC=' ' +-ac_dD=',;t' +-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='$,\1#\2define\3' +-ac_uC=' ' +-ac_uD=',;t' ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} + +-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ rm -f "$tmp/stdin" + case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac +- +- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- # Do quote $f, to prevent DOS paths from being IFS'd. +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +- # Remove the trailing spaces. +- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in +- ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # + _ACEOF + +-# Transform confdefs.h into two sed scripts, `conftest.defines' and +-# `conftest.undefs', that substitutes the proper values into +-# config.h.in to produce config.h. The first handles `#define' +-# templates, and the second `#undef' templates. +-# And first: Protect against being on the right side of a sed subst in +-# config.status. Protect against being in an unquoted here document +-# in config.status. +-rm -f conftest.defines conftest.undefs +-# Using a here document instead of a string reduces the quoting nightmare. +-# Putting comments in sed scripts is not portable. +-# +-# `end' is used to avoid that the second main sed command (meant for +-# 0-ary CPP macros) applies to n-ary macro definitions. +-# See the Autoconf documentation for `clear'. +-cat >confdef2sed.sed <<\_ACEOF +-s/[\\&,]/\\&/g +-s,[\\$`],\\&,g +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +-t end +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +-: end +-_ACEOF +-# If some macros were called several times there might be several times +-# the same #defines, which is useless. Nevertheless, we may not want to +-# sort them, since we want the *last* AC-DEFINE to be honored. +-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +-rm -f confdef2sed.sed ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' + +-# This sed command replaces #undef with comments. This is necessary, for ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines ++ ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for + # example, in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. +-cat >>conftest.undefs <<\_ACEOF +-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +-_ACEOF ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines + +-# Break up conftest.defines because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +-echo ' :' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.defines >/dev/null ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' ++ ++while : + do +- # Write a limited-size here document to $tmp/defines.sed. +- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#define' lines. +- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF +- sed -f $tmp/defines.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines + done +-rm -f conftest.defines +-echo ' fi # grep' >>$CONFIG_STATUS +-echo >>$CONFIG_STATUS +- +-# Break up conftest.undefs because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.undefs >/dev/null +-do +- # Write a limited-size here document to $tmp/undefs.sed. +- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#undef' +- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/undefs.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail +- rm -f conftest.undefs +- mv conftest.tail conftest.undefs +-done +-rm -f conftest.undefs ++rm -f conftest.defines conftest.tail + ++echo "ac_result=$ac_in" >>$CONFIG_STATUS + cat >>$CONFIG_STATUS <<\_ACEOF +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- echo "/* Generated by configure. */" >$tmp/config.h +- else +- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h +- fi +- cat $tmp/in >>$tmp/config.h +- rm -f $tmp/in + if test x"$ac_file" != x-; then +- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else +- ac_dir=`(dirname "$ac_file") 2>/dev/null || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- + rm -f $ac_file +- mv $tmp/config.h $ac_file ++ mv "$tmp/config.h" $ac_file + fi + else +- cat $tmp/config.h +- rm -f $tmp/config.h ++ echo "/* $configure_input */" ++ cat "$ac_result" + fi +-done +-_ACEOF ++ rm -f "$tmp/out12" ++ ;; ++ ++ ++ esac ++ ++done # for ac_tag + +-cat >>$CONFIG_STATUS <<\_ACEOF + + { (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 + # Created: 1993-05-16 +@@ -12,7 +12,7 @@ + # . + + 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 @@ + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" +- lasterr="" ++ lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then +@@ -134,7 +142,7 @@ + fi + fi + +- pathcomp="$pathcomp/" ++ pathcomp=$pathcomp/ + done + done + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/03-fix_docs.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/03-fix_docs.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +_# 03-fix_docs.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FAQ and virtual domains installation docs + +@DPATCH@ +diff -urNad complete.dpatch/doc/faq.html /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html +--- complete.dpatch/doc/faq.html 2005-11-10 21:12:04.000000000 +0100 ++++ /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html 2005-11-10 21:12:05.457868786 +0100 +@@ -111,7 +111,7 @@ + + +

Make sure that saslauthd is running and that the cyrus +-user can access the unix domain socket (defaults to /var/run/mux). ++user can access the unix domain socket (defaults to /var/run/saslauthd/mux). + + + +diff -urNad complete.dpatch/doc/install-virtdomains.html /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html +--- complete.dpatch/doc/install-virtdomains.html 2005-11-10 21:12:04.000000000 +0100 ++++ /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html 2005-11-10 21:12:05.457868786 +0100 +@@ -99,6 +99,10 @@ + to the defaultdomain. See Administrators + below for further discussion. + ++

Note: Users in the defaultdomain must not ++log in using the user@domain cross-realm login syntax. The ++user@domain type specification only works for them in LMTP. ++ +

Here is a sample imapd.conf with a minimal set of configuration + options.

+ +diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions +--- complete.dpatch/lib/imapoptions 2005-11-10 21:12:04.000000000 +0100 ++++ /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions 2005-11-10 21:13:13.246208162 +0100 +@@ -184,7 +184,11 @@ + mailbox that does not have a parent mailbox. */ + + { "defaultdomain", NULL, STRING } +-/* The default domain for virtual domain support */ ++/* The default domain for virtual domain support. Note that this domain ++ is stripped from the email-address transmitted using LMTP, but it ++ is not stripped from usernames at login-time. For imapd/pop3d, ++ "user" and "user@defaultdomain" specify two different users. ++ Please check install-virtdomains.html for details. */ + + { "defaultpartition", "default", STRING } + /* The partition name used by default for new mailboxes. */ +@@ -436,7 +440,10 @@ + /* The list of remote realms whose users may authenticate using cross-realm + authentication identifiers. Seperate each realm name by a space. (A + cross-realm identity is considered any identity returned by SASL +- with an "@" in it.). */ ++ with an "@" in it.) Note that to support multiple virtual domains ++ on the same interface/IP, you need to list them all as loginreals. ++ If you don't list them here, your users probably won't be able to ++ log in. */ + + { "loginuseacl", 0, SWITCH } + /* If enabled, any authentication identity which has \fBa\fR rights on a --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch by Benjamin Seidenberg +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream compatibility fix for SASL 2.1.22 + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c +--- cyrus-imapd-2.2.13~/imtest/imtest.c 2006-05-05 21:04:25.000000000 -0400 ++++ cyrus-imapd-2.2.13/imtest/imtest.c 2006-05-25 17:49:37.000000000 -0400 +@@ -1,7 +1,7 @@ + /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client + * Ken Murchison (multi-protocol implementation) + * Tim Martin (SASL implementation) +- * $Id: imtest.c,v 1.107 2006/01/20 20:31:23 jeaton Exp $ ++ * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $ + * + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * +@@ -886,6 +886,12 @@ + } + + if (*str != '\r') { ++ /* trim CRLF */ ++ char *p = str + strlen(str) - 1; ++ if (p >= str && *p == '\n') *p-- = '\0'; ++ if (p >= str && *p == '\r') *p-- = '\0'; ++ ++ /* alloc space for decoded response */ + len = strlen(str) + 1; + *line = malloc(len); + if ((*line) == NULL) { --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0015-upstream-fix-logic-error-in-imapoptions.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix a small logical mistake in imapoptions description + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions +--- cyrus-imapd-2.2.13/lib/imapoptions 2006-06-04 21:47:19.000000000 +0200 ++++ /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions 2006-06-06 17:51:14.392340472 +0200 +@@ -42,7 +42,7 @@ + .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + .\" +-.\" $Id: imapoptions,v 1.36 2006/03/30 15:49:58 murch Exp $ ++.\" $Id: imapoptions,v 1.37 2006/06/05 23:31:22 murch Exp $ + .SH NAME + imapd.conf \- IMAP configuration file + .SH DESCRIPTION +@@ -801,7 +801,7 @@ + /* The cyrusdb backend to use for the subscriptions list. */ + + { "syslog_prefix", NULL, STRING } +-/* String to be appended to the process name in syslog entries. */ ++/* String to be prepended to the process name in syslog entries. */ + + { "temp_path", "/tmp", STRING } + /* The pathname to store temporary files in */ --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/75-update-imapd.conf-documentation.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 75-update-imapd.conf-documentation.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: update imapd.conf option descriptions to be a bit more verbose about +## DP: supported option names + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions +--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:15:02.000000000 +0200 ++++ /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:17:59.362341706 +0200 +@@ -69,7 +69,10 @@ + \fB/etc/imapd.conf\fR file, and show each option's default value. + Some options have no default value, these are listed with + ``''. Some options default to the empty string, these +-are listed with ``''. ++are listed with ``''. It is also possible to override options by ++specifying them as _. One example is ``lmtp_admins'', ++which overrides ``admins'' just for the lmtp service. The is the ++one you specified in the \fB/etc/cyrus.conf\fR file. + */ + + # OPTIONS +@@ -122,7 +125,17 @@ + enabled when absolutely necessary. */ + + { "allowplaintext", 1, SWITCH } +-/* Allow the use of cleartext passwords on the wire. */ ++/* Allow the use of cleartext passwords on the wire. ++.PP ++ To disallow the use of plaintext passwords for authentication, you can ++ set ``allowplaintext: no'' in imapd.conf. This will still allow PLAIN ++ under TLS, but IMAP LOGIN commands will now fail. ++.PP ++ If you only list plaintext authentication mechanisms in ``sasl_mech_list'' ++ and set ``allowplaintext: no'', only users on encrypted sessions (TLS or ++ SSL) will be able to authenticate. On the other hand, if you list no ++ plaintext authentication options in ``sasl_mech_list'', ++ ``allowplaintext: yes'' would have no effect. */ + + { "allowusermoves", 0, SWITCH } + /* Allow moving user accounts (with associated meta-data) via RENAME --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/22-imapd_index_check.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/22-imapd_index_check.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22-imapd_index_check.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix usage of index_check() + +@DPATCH@ +diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c +--- complete.dpatch/imap/imapd.c 2005-11-11 16:01:19.000000000 +0100 ++++ /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c 2005-11-11 16:01:37.190206572 +0100 +@@ -3175,8 +3175,8 @@ + + if (usinguid) { + fetchitems |= FETCH_UID; +- index_check(imapd_mailbox, 1, 0); + } ++ index_check(imapd_mailbox, 1, 0); + + fetchargs.fetchitems = fetchitems; + r = index_fetch(imapd_mailbox, sequence, usinguid, &fetchargs, +@@ -3191,6 +3191,9 @@ + } else if (fetchedsomething || usinguid) { + prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag, + error_message(IMAP_OK_COMPLETED), mytime); ++ if(fetchargs.fetchitems & FETCH_SETSEEN) { ++ index_check(imapd_mailbox,usinguid,1); ++ } + } else { + /* normal FETCH, nothing came back */ + prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag, +@@ -3309,7 +3312,8 @@ + + index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething); + +- index_check(imapd_mailbox, 0, 0); ++ index_check(imapd_mailbox, 0, ++ fetchedsomething && (fetchargs.fetchitems & FETCH_SETSEEN)); + + if (fetchedsomething) { + prot_printf(imapd_out, "%s OK %s\r\n", tag, +@@ -3441,7 +3445,9 @@ + r = index_store(imapd_mailbox, sequence, usinguid, &storeargs, + flag, nflags); + +- if (usinguid) { ++ if(storeargs.seen || storeargs.operation==STORE_REPLACE) { ++ index_check(imapd_mailbox, usinguid, 1); ++ } else if (usinguid) { + index_check(imapd_mailbox, 1, 0); + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010-upstream-fix-libRSAglue-linkage by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: check if we need libRSAglue before linking it +## DP: Upstream committer: murch + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/cmulocal/openssl.m4 /tmp/dpep.JZkfga/cyrus-imapd-2.2.13/cmulocal/openssl.m4 +--- cyrus-imapd-2.2.13/cmulocal/openssl.m4 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.JZkfga/cyrus-imapd-2.2.13/cmulocal/openssl.m4 2006-05-17 21:06:43.162414202 +0200 +@@ -1,6 +1,6 @@ + dnl + dnl macros for configure.in to detect openssl +-dnl $Id: openssl.m4,v 1.10 2005/04/26 19:14:08 shadow Exp $ ++dnl $Id: openssl.m4,v 1.11 2006/05/17 18:30:19 murch Exp $ + dnl + + AC_DEFUN([CMU_HAVE_OPENSSL], [ +@@ -24,8 +24,11 @@ + dnl we need to include the rsaref libraries in the crypto check + LIB_RSAREF="" + AC_CHECK_LIB(rsaref, RSAPublicEncrypt, +- LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes, +- cmu_have_rsaref=no) ++ cmu_have_rsaref=yes; ++ [AC_CHECK_LIB(RSAglue, RSAPublicEncrypt, ++ LIB_RSAREF="-lRSAglue -lrsaref", ++ LIB_RSAREF="-lrsaref")], ++ cmu_have_rsaref=no) + + AC_CHECK_HEADER(openssl/evp.h, [ + AC_CHECK_LIB(crypto, EVP_DigestInit, --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 17-fix_tail_syntax_in_xversion.h.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix tail syntax in xversion.h (use "tail -n 1" instead of "tail -1") + +@DPATCH@ +diff -urNad complete.dpatch/imap/xversion.sh /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh +--- complete.dpatch/imap/xversion.sh 2003-10-22 20:03:00.000000000 +0200 ++++ /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh 2005-11-10 17:14:52.208238481 +0100 +@@ -22,4 +22,4 @@ + match ($0, pattern) { + printf "\"%s\"\n", substr($0, RSTART, RLENGTH) + }' pattern="$DATEPAT $TIMEPAT" | \ +- sort | tail -1 >> xversion.h ++ sort | tail -n 1 >> xversion.h --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/04-add_autogen.sh.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/04-add_autogen.sh.dpatch @@ -0,0 +1,88 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-add_autogen.sh.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add autogen.sh + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/autogen.sh /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh +--- cyrus-imapd-2.2.12/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh 2005-11-11 19:47:43.571058024 +0100 +@@ -0,0 +1,77 @@ ++#!/bin/sh ++# ++# autogen.sh glue for CMU Cyrus IMAP ++# $Id: autogen.sh,v 1.16 2004/09/12 15:30:23 hmh Exp $ ++# ++# Requires: automake 1.9, autoconf 2.57, dpkg-dev ++set -e ++ ++# Refresh GNU autotools toolchain. ++echo Running GNU autotools toolchain... ++AUTOMAKEDIR=/usr/share/automake-1.9 ++[ -n "$AUTOMAKEDIR" ] && ++ for i in config.guess config.sub install-sh mkinstalldirs ; do ++ test -r ${AUTOMAKEDIR}/${i} && { ++ rm -f ${i} || true ++ cp ${AUTOMAKEDIR}/${i} . ++ } ++ chmod 755 ${i} ++ done ++ ++aclocal-1.9 -I cmulocal ++autoheader ++#automake --verbose --foreign --add-missing ++autoconf ++ ++# For the Debian build ++test -d debian && { ++ # Kill executable list first ++ #rm -f debian/executable.files ++ ++ # Make sure our executable and removable lists won't be screwed up ++ #debclean && echo Cleaned buildtree just in case... ++ ++ # refresh list of executable scripts, to avoid possible breakage if ++ # upstream tarball does not include the file or if it is mispackaged ++ # for whatever reason. ++ #echo Generating list of executable files... ++ #rm -f debian/executable.files ++ #find -type f -perm +111 ! -name '.*' -print | sort > debian/executable.files ++ ++ # even in Debian builds, copy them in, don't link them ++ rm -f config.sub config.guess ++ cp /usr/share/misc/config.sub . ++ cp /usr/share/misc/config.guess . ++ ++ # Remove any files in upstream tarball that we don't have in the Debian ++ # package (because diff cannot remove files) ++ # THIS CRAP IS NOT EMBEDDED SPACE-SAFE! ++ version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'` ++ source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '` ++ #if test -r ../${source}_${version}.orig.tar.gz ; then ++ # echo Generating list of files that should be removed... ++ # rm -f debian/deletable.files ++ # touch debian/deletable.files.new ++ # mkdir debian/tmp ++ # cd debian/tmp ++ # tar -zxf ../../../${source}_${version}.orig.tar.gz ++ # # et/ we handle directly ++ # rm -fr */et/ ++ # cd ../.. ++ # for i in `find debian/tmp/ -type f ! -name '.*' -print | xargs` ; do ++ # if test -r ${i} ; then ++ # filename=`echo "${i}" | sed -e 's#.*debian/tmp/[^/]+/##'` ++ # test -r "${filename}" || echo "${filename}" >>debian/deletable.files.new ++ # fi ++ # done ++ # sort < debian/deletable.files.new > debian/deletable.files \ ++ # && rm debian/deletable.files.new ++ # rm -fr debian/tmp ++ #else ++ # echo Emptying list of files that should be deleted... ++ # rm -f debian/deletable.files ++ # touch debian/deletable.files ++ #fi ++} ++ ++exit 0 --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0019-upstream-sieve_allowreferrals.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch @@ -0,0 +1,650 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0019-upstream-sieve_allowreferrals.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream: patch sieve to allow referrals + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html +--- cyrus-imapd-2.2.13/doc/changes.html 2006-08-31 16:46:21.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html 2006-08-31 16:53:15.970326054 +0200 +@@ -1,6 +1,6 @@ + +- ++ + + + +@@ -14,6 +14,14 @@ + making it useful for remote mailboxes. + + ++

Changes to the Cyrus IMAP Server since 2.2.13

++
    ++
  • ctl_mboxlist now dumps/undumps the mailbox type flags, ++making it useful for remote mailboxes.
    • ++
  • Added sieve_allowreferrals option to control whether ++timsieved issues referrals or proxys traffic to backends.
    • ++
++ +

Changes to the Cyrus IMAP Server since 2.2.12

+
    +
  • Allow sieve scripts to be run on shared mailboxes (via sieve +@@ -2034,7 +2042,7 @@ +
+ +
+-last modified: $Date: 2006/03/31 15:24:29 $
++last modified: $Date: 2006/08/30 16:29:10 $
+ Return to the Cyrus IMAP Server Home Page + + +diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/backend.c +--- cyrus-imapd-2.2.13/imap/backend.c 2006-08-31 16:46:21.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/backend.c 2006-08-31 16:55:26.609576327 +0200 +@@ -39,7 +39,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: backend.c,v 1.41 2006/05/11 18:05:29 murch Exp $ */ ++/* $Id: backend.c,v 1.42 2006/08/30 16:29:11 murch Exp $ */ + + #include + +@@ -74,7 +74,8 @@ + #include "util.h" + + static char *ask_capability(struct protstream *pout, struct protstream *pin, +- struct protocol_t *prot, unsigned long *capa) ++ struct protocol_t *prot, unsigned long *capa, ++ int banner) + { + char str[4096]; + char *ret = NULL, *tmp; +@@ -82,7 +83,7 @@ + + *capa = 0; + +- if (prot->capa_cmd.cmd) { ++ if (!banner && prot->capa_cmd.cmd) { + /* request capabilities of server */ + prot_printf(pout, "%s\r\n", prot->capa_cmd.cmd); + prot_flush(pout); +@@ -239,7 +240,7 @@ + /* If we don't have a usable mech, do TLS and try again */ + } while (r == SASL_NOMECH && CAPA(s, CAPA_STARTTLS) && + do_starttls(s, &prot->tls_cmd) != -1 && +- (*mechlist = ask_capability(s->out, s->in, prot, &s->capability))); ++ (*mechlist = ask_capability(s->out, s->in, prot, &s->capability, 0))); + + /* xxx unclear that this is correct */ + free_callbacks(cb); +@@ -378,20 +379,23 @@ + ret->sock = sock; + prot_setflushonread(ret->in, ret->out); + +- if (prot->capa_cmd.cmd) { +- /* read the initial greeting */ +- if (!prot_fgets(buf, sizeof(buf), ret->in)) { +- syslog(LOG_ERR, +- "backend_connect(): couldn't read initial greeting: %s", +- ret->in->error ? ret->in->error : "(null)"); +- if (!ret_backend) free(ret); +- close(sock); +- return NULL; +- } ++ if (!prot->banner.is_capa) { ++ do { /* read the initial greeting */ ++ if (!prot_fgets(buf, sizeof(buf), ret->in)) { ++ syslog(LOG_ERR, ++ "backend_connect(): couldn't read initial greeting: %s", ++ ret->in->error ? ret->in->error : "(null)"); ++ if (!ret_backend) free(ret); ++ close(sock); ++ return NULL; ++ } ++ } while (strncasecmp(buf, prot->banner.resp, ++ strlen(prot->banner.resp))); + } + + /* get the capabilities */ +- mechlist = ask_capability(ret->out, ret->in, prot, &ret->capability); ++ mechlist = ask_capability(ret->out, ret->in, prot, &ret->capability, ++ prot->banner.is_capa); + + /* now need to authenticate to backend server, + unless we're doing LMTP on a UNIX socket (deliver) */ +diff -urNad cyrus-imapd-2.2.13/imap/protocol.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.c +--- cyrus-imapd-2.2.13/imap/protocol.c 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.c 2006-08-31 16:53:15.973325759 +0200 +@@ -39,7 +39,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: protocol.c,v 1.13 2004/12/07 19:26:24 ken3 Exp $ */ ++/* $Id: protocol.c,v 1.14 2006/08/30 16:29:11 murch Exp $ */ + + #include + +@@ -89,8 +89,24 @@ + return success; + } + ++static char *sieve_parsesuccess(char *str, const char **status) ++{ ++ char *success = NULL, *tmp; ++ ++ if (!strncmp(str, "OK (", 4) && ++ (tmp = strstr(str+4, "SASL \"")) != NULL) { ++ success = tmp+6; /* skip SASL " */ ++ tmp = strstr(success, "\""); ++ *tmp = '\0'; /* clip " */ ++ } ++ ++ if (status) *status = NULL; ++ return success; ++} ++ + struct protocol_t protocol[] = { + { "imap", "imap", ++ { 0, "* OK" }, + { "C01 CAPABILITY", "C01 ", &imap_parsemechlist, + { { " AUTH=", CAPA_AUTH }, + { " STARTTLS", CAPA_STARTTLS }, +@@ -103,6 +119,7 @@ + { "N01 NOOP", "N01 OK" }, + { "Q01 LOGOUT", "Q01 " } }, + { "pop3", "pop", ++ { 0, "+OK " }, + { "CAPA", ".", NULL, + { { "SASL ", CAPA_AUTH }, + { "STLS", CAPA_STARTTLS }, +@@ -112,6 +129,7 @@ + { "NOOP", "+OK" }, + { "QUIT", "+OK" } }, + { "nntp", "nntp", ++ { 0, "20" }, + { "CAPABILITIES", ".", NULL, + { { "SASL ", CAPA_AUTH }, + { "STARTTLS", CAPA_STARTTLS }, +@@ -121,6 +139,7 @@ + { "DATE", "111" }, + { "QUIT", "205" } }, + { "lmtp", "lmtp", ++ { 0, "220 " }, + { "LHLO murder", "250 ", NULL, + { { "AUTH ", CAPA_AUTH }, + { "STARTTLS", CAPA_STARTTLS }, +@@ -132,11 +151,22 @@ + { "NOOP", "250" }, + { "QUIT", "221" } }, + { "mupdate", "mupdate", ++ { 1, "* OK" }, + { NULL, "* OK", NULL, + { { "* AUTH ", CAPA_AUTH }, + { NULL, 0 } } }, + { "S01 STARTTLS", "S01 OK", "S01 NO" }, + { "A01 AUTHENTICATE", INT_MAX, 1, "A01 OK", "A01 NO", "", "*", NULL }, + { "N01 NOOP", "N01 OK" }, +- { "Q01 LOGOUT", "Q01 " } } ++ { "Q01 LOGOUT", "Q01 " } }, ++ { "sieve", SIEVE_SERVICE_NAME, ++ { 1, "OK" }, ++ { "CAPABILITY", "OK", NULL, ++ { { "\"SASL\" ", CAPA_AUTH }, ++ { "\"STARTTLS\"", CAPA_STARTTLS }, ++ { NULL, 0 } } }, ++ { "STARTTLS", "OK", "NO" }, ++ { "AUTHENTICATE", INT_MAX, 1, "OK", "NO", NULL, "*", &sieve_parsesuccess }, ++ { NULL, NULL, NULL }, ++ { "LOGOUT", NULL, "OK" } } + }; +diff -urNad cyrus-imapd-2.2.13/imap/protocol.h /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.h +--- cyrus-imapd-2.2.13/imap/protocol.h 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.h 2006-08-31 16:53:15.973325759 +0200 +@@ -39,7 +39,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: protocol.h,v 1.5 2004/05/06 18:52:07 ken3 Exp $ */ ++/* $Id: protocol.h,v 1.6 2006/08/30 16:29:11 murch Exp $ */ + + #ifndef _INCLUDED_PROTOCOL_H + #define _INCLUDED_PROTOCOL_H +@@ -70,9 +70,13 @@ + + struct protocol_t; + ++struct banner_t { ++ int is_capa; /* banner is capability response */ ++ char *resp; /* end of banner response */ ++}; ++ + struct capa_cmd_t { +- const char *cmd; /* [OPTIONAL] capability command string +- (NULL = capabilities in banner) */ ++ const char *cmd; /* [OPTIONAL] capability command string */ + const char *resp; /* end of capability response */ + char *(*parse_mechlist)(const char *str, struct protocol_t *prot); + /* [OPTIONAL] parse capability string, +@@ -95,6 +99,7 @@ + struct protocol_t { + const char *service; /* INET service name */ + const char *sasl_service; /* SASL service name */ ++ struct banner_t banner; + struct capa_cmd_t capa_cmd; + struct tls_cmd_t tls_cmd; + struct sasl_cmd_t sasl_cmd; +@@ -109,7 +114,8 @@ + PROTOCOL_POP3, + PROTOCOL_NNTP, + PROTOCOL_LMTP, +- PROTOCOL_MUPDATE ++ PROTOCOL_MUPDATE, ++ PROTOCOL_SIEVE + }; + + #endif /* _INCLUDED_PROTOCOL_H */ +diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/saslclient.c +--- cyrus-imapd-2.2.13/imap/saslclient.c 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/saslclient.c 2006-08-31 16:53:15.972325858 +0200 +@@ -39,7 +39,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: saslclient.c,v 1.13 2004/07/07 19:49:05 rjs3 Exp $ */ ++/* $Id: saslclient.c,v 1.14 2006/08/30 16:29:11 murch Exp $ */ + + #include + +@@ -237,21 +237,24 @@ + do { + char *p; + ++ base64 = buf; ++ *base64 = '\0'; ++ + if (clientout) { /* response */ + /* convert to base64 */ +- base64 = buf; + r = sasl_encode64(clientout, clientoutlen, + base64, BASE64_BUF_SIZE, NULL); + + clientout = NULL; ++ } + +- /* send to server */ +- if (sendliteral) { +- prot_printf(pout, "{%d+}\r\n", strlen(base64)); +- prot_flush(pout); +- } +- prot_printf(pout, "%s", base64); ++ /* send to server */ ++ if (sendliteral) { ++ prot_printf(pout, "{%d+}\r\n", strlen(base64)); ++ prot_flush(pout); + } ++ prot_printf(pout, "%s", base64); ++ + noinitresp: + prot_printf(pout, "\r\n"); + prot_flush(pout); +@@ -281,10 +284,23 @@ + r = SASL_BADAUTH; + break; + } +- else if (!strncasecmp(buf, sasl_cmd->cont, strlen(sasl_cmd->cont))) { ++ else if (sasl_cmd->cont && ++ !strncasecmp(buf, sasl_cmd->cont, strlen(sasl_cmd->cont))) { + /* continue */ + base64 = buf + strlen(sasl_cmd->cont); + } ++ else if (!sasl_cmd->cont && buf[0] == '{') { ++ unsigned int litsize = atoi(buf+1); ++ ++ /* get actual literal data */ ++ if (!prot_fgets(buf, AUTH_BUF_SIZE, pin)) { ++ if (sasl_result) *sasl_result = SASL_FAIL; ++ if (status) *status = "EOF from server"; ++ return IMAP_SASL_PROTERR; ++ } ++ ++ base64 = buf; ++ } + else { + /* unknown response */ + if (status) *status = buf; +diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/lib/imapoptions +--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-31 16:46:22.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-31 16:53:44.074560998 +0200 +@@ -42,7 +42,7 @@ + .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + .\" +-.\" $Id: imapoptions,v 1.37 2006/06/05 23:31:22 murch Exp $ ++.\" $Id: imapoptions,v 1.38 2006/08/30 16:29:11 murch Exp $ + .SH NAME + imapd.conf \- IMAP configuration file + .SH DESCRIPTION +@@ -853,6 +853,11 @@ + /* If using the alternate IMAP namespace, the prefix for the other users + namespace. The hierarchy delimiter will be automatically appended. */ + ++{ "sieve_allowreferrals", 1, SWITCH } ++/* If enabled, timsieved will issue referrals to clients when the ++ user's scripts reside on a remote server (in a Murder). ++ Otherwise, timsieved will proxy traffic to the remote server. */ ++ + # xxx badly worded + { "unix_group_enable", 1, SWITCH } + /* Should we look up groups when using auth_unix (disable this if you are +diff -urNad cyrus-imapd-2.2.13/timsieved/Makefile.in /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/Makefile.in +--- cyrus-imapd-2.2.13/timsieved/Makefile.in 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/Makefile.in 2006-08-31 16:53:15.967326349 +0200 +@@ -1,5 +1,5 @@ + # Makefile.in - timsieved makefile +-# $Id: Makefile.in,v 1.24 2004/05/28 18:03:10 rjs3 Exp $ ++# $Id: Makefile.in,v 1.25 2006/08/30 16:29:11 murch Exp $ + # @configure_input@ + # + # Copyright (c) 1998-2000 Carnegie Mellon University. All rights reserved. +@@ -83,7 +83,7 @@ + $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path) + + OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \ +- ../imap/tls.o ++ ../imap/tls.o ../imap/backend.o + + timsieved: $(OBJS) $(SERVICE) + $(CC) $(LDFLAGS) -o timsieved \ +diff -urNad cyrus-imapd-2.2.13/timsieved/actions.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/actions.c +--- cyrus-imapd-2.2.13/timsieved/actions.c 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/actions.c 2006-08-31 16:53:15.967326349 +0200 +@@ -1,6 +1,6 @@ + /* actions.c -- executes the commands for timsieved + * Tim Martin +- * $Id: actions.c,v 1.38 2005/11/18 14:18:18 murch Exp $ ++ * $Id: actions.c,v 1.39 2006/08/30 16:29:11 murch Exp $ + */ + /* + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. +@@ -177,8 +177,9 @@ + int mechcount; + + /* implementation */ +- prot_printf(conn, "\"IMPLEMENTATION\" \"Cyrus timsieved %s\"\r\n", +- CYRUS_VERSION); ++ prot_printf(conn, ++ "\"IMPLEMENTATION\" \"Cyrus timsieved%s %s\"\r\n", ++ config_mupdate_server ? " (Murder)" : "", CYRUS_VERSION); + + /* SASL */ + if (!authenticated && +diff -urNad cyrus-imapd-2.2.13/timsieved/parser.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/parser.c +--- cyrus-imapd-2.2.13/timsieved/parser.c 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/parser.c 2006-08-31 16:53:15.968326251 +0200 +@@ -1,7 +1,7 @@ + /* parser.c -- parser used by timsieved + * Tim Martin + * 9/21/99 +- * $Id: parser.c,v 1.39 2005/11/03 13:41:54 murch Exp $ ++ * $Id: parser.c,v 1.40 2006/08/30 16:29:11 murch Exp $ + */ + /* + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. +@@ -60,6 +60,7 @@ + #include "libconfig.h" + #include "global.h" + #include "auth.h" ++#include "backend.h" + #include "mboxname.h" + #include "mboxlist.h" + #include "xmalloc.h" +@@ -90,6 +91,7 @@ + /* from elsewhere */ + void fatal(const char *s, int code); + extern int sieved_logfd; ++extern struct backend *backend; + + /* forward declarations */ + static void cmd_logout(struct protstream *sieved_out, +@@ -680,19 +682,20 @@ + } + + if(type & MBTYPE_REMOTE) { +- /* It's a remote mailbox, we want to set up a referral */ +- if (sieved_domainfromip) { +- char *authname, *p; ++ /* It's a remote mailbox */ ++ if (config_getswitch(IMAPOPT_SIEVE_ALLOWREFERRALS)) { ++ /* We want to set up a referral */ ++ if (sieved_domainfromip) { ++ char *authname, *p; + +- /* get a new copy of the userid */ +- free(username); +- username = xstrdup(canon_user); ++ /* get a new copy of the userid */ ++ free(username); ++ username = xstrdup(canon_user); + +- /* get the authid from SASL */ +- sasl_result=sasl_getprop(sieved_saslconn, SASL_AUTHUSER, +- (const void **) &canon_user); +- if (sasl_result!=SASL_OK) +- { ++ /* get the authid from SASL */ ++ sasl_result=sasl_getprop(sieved_saslconn, SASL_AUTHUSER, ++ (const void **) &canon_user); ++ if (sasl_result!=SASL_OK) { + *errmsg = "Internal SASL error"; + syslog(LOG_ERR, "SASL: sasl_getprop SASL_AUTHUSER: %s", + sasl_errstring(sasl_result, NULL, NULL)); +@@ -704,21 +707,46 @@ + ret = FALSE; + goto cleanup; + } +- authname = xstrdup(canon_user); ++ authname = xstrdup(canon_user); + +- if ((p = strchr(authname, '@'))) *p = '%'; +- if ((p = strchr(username, '@'))) *p = '%'; ++ if ((p = strchr(authname, '@'))) *p = '%'; ++ if ((p = strchr(username, '@'))) *p = '%'; + +- referral_host = +- (char*) xmalloc(strlen(authname)+1+strlen(username)+1+ +- strlen(server)+1); +- sprintf((char*) referral_host, "%s;%s@%s", +- authname, username, server); ++ referral_host = ++ (char*) xmalloc(strlen(authname)+1+strlen(username)+1+ ++ strlen(server)+1); ++ sprintf((char*) referral_host, "%s;%s@%s", ++ authname, username, server); + +- free(authname); ++ free(authname); ++ } ++ else ++ referral_host = xstrdup(server); ++ } ++ else { ++ /* We want to set up a connection to the backend for proxying */ ++ const char *statusline = NULL; ++ ++ /* xxx hide the fact that we are storing partitions */ ++ if (server) { ++ char *c; ++ c = strchr(server, '!'); ++ if(c) *c = '\0'; ++ } ++ ++ backend = backend_connect(NULL, server, &protocol[PROTOCOL_SIEVE], ++ username, &statusline); ++ ++ if (!backend) { ++ syslog(LOG_ERR, "couldn't authenticate to backend server"); ++ prot_printf(sieved_out, "NO \"%s\"\r\n", ++ statusline ? statusline : ++ "Authentication to backend server failed"); ++ prot_flush(sieved_out); ++ ++ goto cleanup; ++ } + } +- else +- referral_host = xstrdup(server); + } else if (actions_setuser(username) != TIMSIEVE_OK) { + *errmsg = "internal error"; + syslog(LOG_ERR, "error in actions_setuser()"); +diff -urNad cyrus-imapd-2.2.13/timsieved/timsieved.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/timsieved.c +--- cyrus-imapd-2.2.13/timsieved/timsieved.c 2006-08-31 16:44:13.000000000 +0200 ++++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/timsieved.c 2006-08-31 16:53:15.968326251 +0200 +@@ -1,7 +1,7 @@ + /* timsieved.c -- main file for timsieved (sieve script accepting program) + * Tim Martin + * 9/21/99 +- * $Id: timsieved.c,v 1.56 2005/11/18 14:18:35 murch Exp $ ++ * $Id: timsieved.c,v 1.57 2006/08/30 16:29:11 murch Exp $ + */ + /* + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. +@@ -82,6 +82,7 @@ + + #include "auth.h" + #include "acl.h" ++#include "backend.h" + #include "mboxlist.h" + #include "util.h" + +@@ -117,12 +118,24 @@ + 1, 1, &sieved_authstate, &sieved_userisadmin, NULL + }; + ++/* PROXY stuff */ ++struct backend *backend = NULL; ++ ++static void bitpipe(void); ++/* end PROXY stuff */ ++ + /* + * Cleanly shut down and exit + */ + void shut_down(int code) __attribute__ ((noreturn)); + void shut_down(int code) + { ++ /* close backend connection */ ++ if (backend) { ++ backend_disconnect(backend, &protocol[PROTOCOL_SIEVE]); ++ free(backend); ++ } ++ + /* close mailboxes */ + mboxlist_close(); + mboxlist_done(); +@@ -161,6 +174,14 @@ + + while (ret != TRUE) + { ++ if (backend) { ++ /* create a pipe from client to backend */ ++ bitpipe(); ++ ++ /* pipe has been closed */ ++ return; ++ } ++ + ret = parser(sieved_out, sieved_in); + } + +@@ -202,7 +223,7 @@ + char **argv __attribute__((unused)), + char **envp __attribute__((unused))) + { +- global_sasl_init(0, 1, mysasl_cb); ++ global_sasl_init(1, 1, mysasl_cb); + + /* open mailboxes */ + mboxlist_init(0); +@@ -351,3 +372,79 @@ + + return SASL_OK; + } ++ ++/* we've authenticated the client, we've connected to the backend. ++ now it's all up to them */ ++static void bitpipe(void) ++{ ++ struct protgroup *protin = protgroup_new(2); ++ struct protgroup *protout = NULL; ++ struct timeval timeout; ++ int n, shutdown = 0; ++ char buf[4096]; ++ ++ /* Reset protin to all zeros (to preserve memory allocation) */ ++ protgroup_reset(protin); ++ protgroup_insert(protin, sieved_in); ++ protgroup_insert(protin, backend->in); ++ ++ for (;;) { ++ /* check for shutdown file */ ++ if (shutdown_file(buf, sizeof(buf))) { ++ shutdown = 1; ++ goto done; ++ } ++ ++ /* Clear protout if needed */ ++ protgroup_free(protout); ++ protout = NULL; ++ ++ timeout.tv_sec = 60; ++ timeout.tv_usec = 0; ++ ++ n = prot_select(protin, PROT_NO_FD, &protout, NULL, &timeout); ++ if (n == -1) { ++ syslog(LOG_ERR, "prot_select() failed in bitpipe(): %m"); ++ fatal("prot_select() failed in bitpipe()", EC_TEMPFAIL); ++ } ++ if (n && protout) { ++ struct protstream *ptmp; ++ ++ for (; n; n--) { ++ ptmp = protgroup_getelement(protout, n-1); ++ ++ if (ptmp == sieved_in) { ++ do { ++ int c = prot_read(sieved_in, buf, sizeof(buf)); ++ if (c == 0 || c < 0) goto done; ++ prot_write(backend->out, buf, c); ++ } while (sieved_in->cnt > 0); ++ prot_flush(backend->out); ++ } ++ else if (ptmp == backend->in) { ++ do { ++ int c = prot_read(backend->in, buf, sizeof(buf)); ++ if (c == 0 || c < 0) goto done; ++ prot_write(sieved_out, buf, c); ++ } while (backend->in->cnt > 0); ++ prot_flush(sieved_out); ++ } ++ else { ++ /* XXX shouldn't get here !!! */ ++ fatal("unknown protstream returned by prot_select in bitpipe()", ++ EC_SOFTWARE); ++ } ++ } ++ } ++ } ++ ++ ++ done: ++ /* ok, we're done. */ ++ protgroup_free(protin); ++ protgroup_free(protout); ++ ++ if (shutdown) prot_printf(sieved_out, "NO \"%s\"\r\n", buf); ++ ++ return; ++} --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/25-update_install-sh.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/25-update_install-sh.dpatch @@ -0,0 +1,530 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_update_install.sh.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: update install-sh to a more recent version + +@DPATCH@ +diff -urN cyrus-imapd-2.2.12/install-sh cyrus-imapd-2.2.12~/install-sh +--- cyrus-imapd-2.2.12/install-sh 2005-08-30 14:42:29.000000000 +0200 ++++ cyrus-imapd-2.2.12~/install-sh 2005-08-30 14:36:59.000000000 +0200 +@@ -1,23 +1,52 @@ + #!/bin/sh +-# + # install - install a program, script, or datafile +-# This comes from X11R5. ++ ++scriptversion=2005-02-02.21 ++ ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. ++# ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent + # `make' implicit rules from creating a file called install from it + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. +-# +- ++# from scratch. It can only install one file at a time, a restriction ++# shared with many OS's install programs. + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. + doit="${DOITPROG-}" + +- + # put in absolute paths if you don't have them in your path; or use env. vars. + + mvprog="${MVPROG-mv}" +@@ -29,210 +58,266 @@ + rmprog="${RMPROG-rm}" + mkdirprog="${MKDIRPROG-mkdir}" + +-tranformbasename="" +-transform_arg="" +-instcmd="$mvprog" + chmodcmd="$chmodprog 0755" +-chowncmd="" +-chgrpcmd="" +-stripcmd="" ++chowncmd= ++chgrpcmd= ++stripcmd= + rmcmd="$rmprog -f" + mvcmd="$mvprog" +-src="" +-dst="" +-dir_arg="" +- +-while [ x"$1" != x ]; do +- case $1 in +- -c) instcmd="$cpprog" +- shift +- continue;; +- +- -d) dir_arg=true +- shift +- continue;; +- +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; +- +- -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd="$stripprog" +- shift +- continue;; +- +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; +- +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; +- +- *) if [ x"$src" = x ] +- then +- src=$1 +- else +- # this colon is to work around a 386BSD /bin/sh bug +- : +- dst=$1 +- fi +- shift +- continue;; +- esac +-done +- +-if [ x"$src" = x ] +-then +- echo "install: no input file specified" +- exit 1 +-else +- true +-fi +- +-if [ x"$dir_arg" != x ]; then +- dst=$src +- src="" +- +- if [ -d $dst ]; then +- instcmd=: +- else +- instcmd=mkdir +- fi +-else +- +-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad +-# if $src (and thus $dsttmp) contains '*'. +- +- if [ -f $src -o -d $src ] +- then +- true +- else +- echo "install: $src does not exist" +- exit 1 +- fi +- +- if [ x"$dst" = x ] +- then +- echo "install: no destination specified" +- exit 1 +- else +- true +- fi +- +-# If destination is a directory, append the input filename; if your system +-# does not like double slashes in filenames, you may need to add some logic +- +- if [ -d $dst ] +- then +- dst="$dst"/`basename $src` +- else +- true +- fi +-fi +- +-## this sed command emulates the dirname command +-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +- +-# Make sure that the destination directory exists. +-# this part is taken from Noah Friedman's mkinstalldirs script +- +-# Skip lots of stat calls in the usual case. +-if [ ! -d "$dstdir" ]; then +-defaultIFS=' +-' +-IFS="${IFS-${defaultIFS}}" +- +-oIFS="${IFS}" +-# Some sh's can't handle IFS=/ for some reason. +-IFS='%' +-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS="${oIFS}" ++src= ++dst= ++dir_arg= ++dstarg= ++no_target_directory= ++ ++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... ++ ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. ++ ++Options: ++-c (ignored) ++-d create directories instead of installing files. ++-g GROUP $chgrpprog installed files to GROUP. ++-m MODE $chmodprog installed files to MODE. ++-o USER $chownprog installed files to USER. ++-s $stripprog installed files. ++-t DIRECTORY install into DIRECTORY. ++-T report an error if DSTFILE is a directory. ++--help display this help and exit. ++--version display version info and exit. ++ ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++" ++ ++while test -n "$1"; do ++ case $1 in ++ -c) shift ++ continue;; ++ ++ -d) dir_arg=true ++ shift ++ continue;; ++ ++ -g) chgrpcmd="$chgrpprog $2" ++ shift ++ shift ++ continue;; ++ ++ --help) echo "$usage"; exit $?;; ++ ++ -m) chmodcmd="$chmodprog $2" ++ shift ++ shift ++ continue;; ++ ++ -o) chowncmd="$chownprog $2" ++ shift ++ shift ++ continue;; ++ ++ -s) stripcmd=$stripprog ++ shift ++ continue;; + +-pathcomp='' ++ -t) dstarg=$2 ++ shift ++ shift ++ continue;; + +-while [ $# -ne 0 ] ; do +- pathcomp="${pathcomp}${1}" ++ -T) no_target_directory=true + shift ++ continue;; + +- if [ ! -d "${pathcomp}" ] ; +- then +- $mkdirprog "${pathcomp}" +- else +- true +- fi ++ --version) echo "$0 $scriptversion"; exit $?;; + +- pathcomp="${pathcomp}/" ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done ++ break;; ++ esac + done +-fi +- +-if [ x"$dir_arg" != x ] +-then +- $doit $instcmd $dst && +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi +-else +- +-# If we're going to rename the final executable, determine the name now. +- +- if [ x"$transformarg" = x ] +- then +- dstfile=`basename $dst` +- else +- dstfile=`basename $dst $transformbasename | +- sed $transformarg`$transformbasename +- fi +- +-# don't allow the sed command to completely eliminate the filename +- +- if [ x"$dstfile" = x ] +- then +- dstfile=`basename $dst` +- else +- true +- fi +- +-# Make a temp file name in the proper directory. +- +- dsttmp=$dstdir/#inst.$$# + +-# Move or copy the file name to the temp name +- +- $doit $instcmd $src $dsttmp && +- +- trap "rm -f ${dsttmp}" 0 && +- +-# and set any options; do chmod last to preserve setuid bits +- +-# If any of these fail, we abort the whole thing. If we want to +-# ignore errors from any of these, just make sure not to ignore +-# errors from the above "$doit $instcmd $src $dsttmp" command. +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && +- +-# Now rename the file to the real destination. +- +- $doit $rmcmd -f $dstdir/$dstfile && +- $doit $mvcmd $dsttmp $dstdir/$dstfile ++if test -z "$1"; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + +-fi && ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src ;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ src= ++ ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dstarg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dstarg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst ;; ++ esac + ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dstarg: Is a directory" >&2 ++ exit 1 ++ fi ++ dst=$dst/`basename "$src"` ++ fi ++ fi ++ ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ ++ # Make sure that the destination directory exists. ++ ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS ++ ++ pathcomp= ++ ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 ++ shift ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done ++ fi ++ ++ if test -n "$dir_arg"; then ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ ++ else ++ dstfile=`basename "$dst"` ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Copy the file name to the temp name. ++ $doit $cpprog "$src" "$dsttmp" && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ++ ++ # Now rename the file to the real destination. ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ++ || { ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ++ || { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit 1 ++ } ++ else ++ : ++ fi ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ } ++ } ++ fi || { (exit 1); exit 1; } ++done + +-exit 0 ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/01-fix_Makefile.in.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/01-fix_Makefile.in.dpatch @@ -0,0 +1,162 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-fix_Makefile.in.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix all Makefile.in files as necessary + +@DPATCH@ +diff -urNad complete.dpatch/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/Makefile.in +--- complete.dpatch/Makefile.in 2005-02-14 17:43:44.000000000 +0100 ++++ /tmp/dpep.hthEz2/complete.dpatch/Makefile.in 2005-11-10 16:34:20.133821819 +0100 +@@ -41,7 +41,7 @@ + # + + SUBDIRS = man @PRE_SUBDIRS@ lib @SIEVE_SUBDIRS@ @SERVER_SUBDIRS@ \ +- imtest @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@ ++ imtest perl @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@ + DISTSUBDIRS = doc + + srcdir = @srcdir@ +diff -urNad complete.dpatch/imap/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in +--- complete.dpatch/imap/Makefile.in 2004-05-28 20:03:02.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in 2005-11-10 16:34:20.133821819 +0100 +@@ -72,7 +72,7 @@ + LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) + DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @WARNERROR@ + LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ + + SHELL = /bin/sh +diff -urNad complete.dpatch/installsieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in +--- complete.dpatch/installsieve/Makefile.in 2003-10-22 20:50:11.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in 2005-11-10 16:34:20.134821720 +0100 +@@ -48,7 +48,7 @@ + + DEFS = @DEFS@ + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @WARNERROR@ + LDFLAGS = @LDFLAGS@ + + INSTALL = @INSTALL@ +diff -urNad complete.dpatch/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in +--- complete.dpatch/lib/Makefile.in 2004-05-28 20:03:04.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in 2005-11-10 16:34:20.134821720 +0100 +@@ -62,7 +62,7 @@ + LIBS = @LIBS@ + + MAKEDEPEND_CFLAGS = @CFLAGS@ +-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ ++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ @WARNERROR@ -fPIC + LDFLAGS = @LDFLAGS@ + + SHELL = /bin/sh +diff -urNad complete.dpatch/master/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in +--- complete.dpatch/master/Makefile.in 2004-12-17 17:32:24.000000000 +0100 ++++ /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in 2005-11-10 16:34:20.134821720 +0100 +@@ -57,7 +57,7 @@ + CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@ + DEPLIBS = @DEPLIBS@ + +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @WARNERROR@ + LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ + LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ + +diff -urNad complete.dpatch/notifyd/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in +--- complete.dpatch/notifyd/Makefile.in 2004-05-28 20:03:06.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in 2005-11-10 16:34:20.135821621 +0100 +@@ -54,7 +54,7 @@ + + DEFS = @DEFS@ @LOCALDEFS@ + CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @WARNERROR@ + LDFLAGS = @LDFLAGS@ + + prefix = @prefix@ +diff -urNad complete.dpatch/perl/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in +--- complete.dpatch/perl/Makefile.in 2003-10-22 20:50:17.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in 2005-11-10 16:34:20.135821621 +0100 +@@ -82,9 +82,9 @@ + BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ + OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ + SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ +- $(PERL) Makefile.PL PREFIX=$(prefix); \ ++ $(PERL) Makefile.PL INSTALLDIRS=vendor; \ + fi; \ +- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ ++ $(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \ + done + + install:: +diff -urNad complete.dpatch/perl/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in +--- complete.dpatch/perl/sieve/Makefile.in 2003-10-22 20:50:24.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in 2005-11-10 16:34:20.135821621 +0100 +@@ -84,9 +84,9 @@ + BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \ + OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \ + SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \ +- $(PERL) Makefile.PL PREFIX=$(prefix); \ ++ $(PERL) Makefile.PL INSTALLDIRS=vendor; \ + fi; \ +- $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \ ++ $(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \ + done + + install:: +diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in +--- complete.dpatch/perl/sieve/lib/Makefile.in 2004-05-28 20:03:07.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in 2005-11-10 16:34:20.136821523 +0100 +@@ -57,7 +57,7 @@ + DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@ + + MAKEDEPEND_CFLAGS = @CFLAGS@ +-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ ++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC + LDFLAGS = @LDFLAGS@ + + SHELL = /bin/sh +diff -urNad complete.dpatch/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in +--- complete.dpatch/sieve/Makefile.in 2004-05-28 20:03:09.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in 2005-11-10 16:34:20.136821523 +0100 +@@ -40,7 +40,7 @@ + DEFS = @DEFS@ + CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + MAKEDEPEND_CFLAGS = @CFLAGS@ +-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ ++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC + LDFLAGS = @LDFLAGS@ + + MAKEDEPEND = @MAKEDEPEND@ +@@ -51,6 +51,7 @@ + LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) + DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ + ++BINARIES = sievec sieved + BUILT_SOURCES = addr.c addr.h addr-lex.c \ + sieve.c sieve.h sieve-lex.c \ + sieve_err.h sieve_err.c +@@ -114,7 +115,7 @@ + $(COMPILE_ET) $(srcdir)/sieve_err.et + + clean: +- rm -f test *~ *.o *.a Makefile.bak makedepend.log ++ rm -f test *~ *.o *.a Makefile.bak makedepend.log $(BINARIES) + + distclean: clean + rm -f Makefile +diff -urNad complete.dpatch/timsieved/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in +--- complete.dpatch/timsieved/Makefile.in 2004-05-28 20:03:10.000000000 +0200 ++++ /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in 2005-11-10 16:34:20.136821523 +0100 +@@ -54,7 +54,7 @@ + + DEFS = @DEFS@ @LOCALDEFS@ + CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @WARNERROR@ + LDFLAGS = @LDFLAGS@ + + prefix = @prefix@ --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/70-allow-larger-buffers.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/70-allow-larger-buffers.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## allow-larger-buffers-dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to allow larger buffers (especially for list of UIDs). +## DP: Patch taken and "backported" to 2.2 from: +## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-longwords-2.3.3.diff + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c /tmp/dpep.n4kRMv/cyrus-imapd-2.2.13/imap/imapparse.c +--- cyrus-imapd-2.2.13/imap/imapparse.c 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.n4kRMv/cyrus-imapd-2.2.13/imap/imapparse.c 2006-05-24 14:33:42.733793569 +0200 +@@ -52,8 +52,8 @@ + #include "exitcodes.h" + + enum { +- MAXQUOTED = 32768, +- MAXWORD = 32768, ++ MAXQUOTED = 131072, ++ MAXWORD = 131072, + MAXLITERAL = INT_MAX / 20 + }; + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/02-add_mkinstalldirs.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch @@ -0,0 +1,161 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-add_mkinstalldirs.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: add mkinstalldirs + +@DPATCH@ +diff -urNad complete.dpatch/mkinstalldirs /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs +--- complete.dpatch/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs 2005-11-10 16:36:11.547841465 +0100 +@@ -0,0 +1,150 @@ ++#! /bin/sh ++# mkinstalldirs --- make directory hierarchy ++ ++scriptversion=2005-02-02.21 ++ ++# Original author: Noah Friedman ++# Created: 1993-05-16 ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++errstatus=0 ++dirmode="" ++ ++usage="\ ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to ." ++ ++# process command line arguments ++while test $# -gt 0 ; do ++ case $1 in ++ -h | --help | --h*) # -h for help ++ echo "$usage" ++ exit $? ++ ;; ++ -m) # -m PERM arg ++ shift ++ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } ++ dirmode=$1 ++ shift ++ ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit $? ++ ;; ++ --) # stop option processing ++ shift ++ break ++ ;; ++ -*) # unknown option ++ echo "$usage" 1>&2 ++ exit 1 ++ ;; ++ *) # first non-opt arg ++ break ++ ;; ++ esac ++done ++ ++for file ++do ++ if test -d "$file"; then ++ shift ++ else ++ break ++ fi ++done ++ ++case $# in ++ 0) exit 0 ;; ++esac ++ ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. ++case $dirmode in ++ '') ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ echo "mkdir -p -- $*" ++ exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version ++ fi ++ ;; ++ *) ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then ++ echo "mkdir -m $dirmode -p -- $*" ++ exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done ++ fi ++ ;; ++esac ++ ++for file ++do ++ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ shift ++ ++ pathcomp= ++ for d ++ do ++ pathcomp="$pathcomp$d" ++ case $pathcomp in ++ -*) pathcomp=./$pathcomp ;; ++ esac ++ ++ if test ! -d "$pathcomp"; then ++ echo "mkdir $pathcomp" ++ ++ mkdir "$pathcomp" || lasterr=$? ++ ++ if test ! -d "$pathcomp"; then ++ errstatus=$lasterr ++ else ++ if test ! -z "$dirmode"; then ++ echo "chmod $dirmode $pathcomp" ++ lasterr="" ++ chmod "$dirmode" "$pathcomp" || lasterr=$? ++ ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi ++ fi ++ fi ++ ++ pathcomp="$pathcomp/" ++ done ++done ++ ++exit $errstatus ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0001-upstream-fix-segfault.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0001-upstream-fix-segfault.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for imap/backend.c, upstream CVS edition 1.40 + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c +--- cyrus-imapd-2.2.13/imap/backend.c 2006-04-22 17:18:39.000000000 +0200 ++++ /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c 2006-05-02 22:08:32.024194651 +0200 +@@ -271,7 +271,7 @@ + /* need to (re)establish connection to server or create one */ + int sock = -1; + int r; +- int err = 0; ++ int err = -1; + struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res; + struct sockaddr_un sunsock; + char buf[2048], *mechlist = NULL; --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0012-upstream-allow-report-above-4GB-mboxsize by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream patch to allow reporting of mailbox sizes above 4GB + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./imap/annotate.c /tmp/dpep-work.Lq66kS/cyrus-imapd-2.2.13/imap/annotate.c +--- ./imap/annotate.c 2006-04-25 17:28:58.000000000 +0200 ++++ /tmp/dpep-work.Lq66kS/cyrus-imapd-2.2.13/imap/annotate.c 2006-06-08 13:46:52.018338460 +0200 +@@ -703,7 +703,13 @@ + struct mailbox mailbox; + struct index_record record; + int r = 0, msg; ++#ifdef HAVE_LONG_LONG_INT ++ unsigned long long totsize = 0; ++# define SIZE_FMT "%llu" ++#else + unsigned long totsize = 0; ++# define SIZE_FMT "%lu" ++#endif + char value[21]; + struct annotation_data attrib; + +@@ -735,7 +741,7 @@ + + mailbox_close(&mailbox); + +- if (r || snprintf(value, sizeof(value), "%lu", totsize) == -1) ++ if (r || snprintf(value, sizeof(value), SIZE_FMT, totsize) == -1) + return; + + memset(&attrib, 0, sizeof(attrib)); --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0006-upstream-free-backend-fix.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch @@ -0,0 +1,93 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0006-upstream-free-backend-fix.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream fix: only free() the backend struct if we allocated it +## DP: (don't free cached connections) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.78gN6M/cyrus-imapd-2.2.13/imap/backend.c +--- cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:01:09.000000000 +0200 ++++ /tmp/dpep.78gN6M/cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:14:12.909137753 +0200 +@@ -39,7 +39,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: backend.c,v 1.39 2006/02/07 20:57:27 murch Exp $ */ ++/* $Id: backend.c,v 1.41 2006/05/11 18:05:29 murch Exp $ */ + + #include + +@@ -264,7 +264,7 @@ + } + } + +-struct backend *backend_connect(struct backend *ret, const char *server, ++struct backend *backend_connect(struct backend *ret_backend, const char *server, + struct protocol_t *prot, const char *userid, + const char **auth_status) + { +@@ -276,13 +276,16 @@ + struct sockaddr_un sunsock; + char buf[2048], *mechlist = NULL; + struct sigaction action; ++ struct backend *ret; + +- if (!ret) { ++ if (!ret_backend) { + ret = xmalloc(sizeof(struct backend)); + memset(ret, 0, sizeof(struct backend)); + strlcpy(ret->hostname, server, sizeof(ret->hostname)); + ret->timeout = NULL; + } ++ else ++ ret = ret_backend; + + if (server[0] == '/') { /* unix socket */ + res0 = &hints; +@@ -312,7 +315,7 @@ + if (err) { + syslog(LOG_ERR, "getaddrinfo(%s) failed: %s", + server, gai_strerror(err)); +- free(ret); ++ if (!ret_backend) free(ret); + return NULL; + } + /* Get addrinfo struct for local interface. */ +@@ -363,7 +366,7 @@ + if (res0 != &hints) + freeaddrinfo(res0); + syslog(LOG_ERR, "connect(%s) failed: %m", server); +- free(ret); ++ if (!ret_backend) free(ret); + return NULL; + } + memcpy(&ret->addr, res->ai_addr, res->ai_addrlen); +@@ -381,7 +384,7 @@ + syslog(LOG_ERR, + "backend_connect(): couldn't read initial greeting: %s", + ret->in->error ? ret->in->error : "(null)"); +- free(ret); ++ if (!ret_backend) free(ret); + close(sock); + return NULL; + } +@@ -396,14 +399,16 @@ + if ((r = backend_authenticate(ret, prot, &mechlist, userid, auth_status))) { + syslog(LOG_ERR, "couldn't authenticate to backend server: %s", + sasl_errstring(r, NULL, NULL)); +- free(ret); ++ if (!ret_backend) free(ret); + close(sock); + ret = NULL; + } + } + + if (mechlist) free(mechlist); +- ++ ++ if (!ret_backend) ret_backend = ret; ++ + return ret; + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/07-update_aclocal_and_configure.in.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07-update_aclocal.m4.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: update aclocal.m4 and configure.in + +@DPATCH@ +diff -urNad complete.dpatch/configure.in /tmp/dpep.IJ03bC/complete.dpatch/configure.in +--- complete.dpatch/configure.in 2005-01-19 00:46:00.000000000 +0100 ++++ /tmp/dpep.IJ03bC/complete.dpatch/configure.in 2005-11-10 18:42:37.579406942 +0100 +@@ -51,6 +51,11 @@ + AC_CONFIG_HEADER(config.h) + AC_CANONICAL_HOST + ++dnl Useful for maintainer mode stuff ++WARNERROR=-W ++AC_ARG_ENABLE(warnings-are-errors,[ --enable-warnings-are-errors add -Werror to most gcc calls], [ if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi ]) ++AC_SUBST(WARNERROR) ++ + dnl Useful hook for distributions + AC_ARG_WITH(extraident,[ --with-extraident=STRING use STRING as extra version information], + [AC_DEFINE_UNQUOTED(EXTRA_IDENT,"$withval", [Extra version information for imap/version.h])]) +@@ -94,10 +99,12 @@ + AC_ISC_POSIX + AC_PROG_AWK + AC_C_CONST +-AC_SYS_LONG_FILE_NAMES +-if test $ac_cv_sys_long_file_names = no; then +- AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names) +-fi ++dnl fakeroot sometimes fails this test ++dnl and Debian always supports long filenames anyway ++dnl AC_SYS_LONG_FILE_NAMES ++dnl if test $ac_cv_sys_long_file_names = no; then ++dnl AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names) ++dnl fi + AC_C_INLINE + + CMU_C___ATTRIBUTE__ +@@ -1202,7 +1209,11 @@ + SQUAT_ENGINE = 1, + + /* should we have long LMTP error messages? */ +- LMTP_LONG_ERROR_MSGS = 1 ++ LMTP_LONG_ERROR_MSGS = 1, ++ ++ /* default time to wait, in seconds, before giving up ++ * trying to lock something */ ++ LOCK_GIVEUP_TIMER_DEFAULT = 100 + }; + + #endif /* _CYRUS_IMAPD_CONFIG_H_ */ --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/13-master_process_handling.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/13-master_process_handling.dpatch @@ -0,0 +1,245 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 13-master_process_handling.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes process (child) handling in master process + +@DPATCH@ +diff -urNad complete.dpatch/master/master.c /tmp/dpep.NKIIR9/complete.dpatch/master/master.c +--- complete.dpatch/master/master.c 2005-11-11 17:03:04.000000000 +0100 ++++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.c 2005-11-11 17:04:39.273704930 +0100 +@@ -162,6 +162,8 @@ + static struct centry *ctable[child_table_size]; + static struct centry *cfreelist; + ++static int child_mourning_time = 2; /* Time in seconds to remember child ++ after processing SIGCHLD */ + static int janitor_frequency = 1; /* Janitor sweeps per second */ + static int janitor_position; /* Entry to begin at in next sweep */ + static struct timeval janitor_mark; /* Last time janitor did a sweep */ +@@ -186,9 +188,9 @@ + int become_cyrus(void) + { + struct passwd *p; +- int newuid, newgid; ++ uid_t newuid, newgid; + int result; +- static int uid = 0; ++ static uid_t uid = 0; + + if (uid) return setuid(uid); + +@@ -915,7 +917,7 @@ + } + } + c->service_state = SERVICE_STATE_DEAD; +- c->janitor_deadline = time(NULL) + 2; ++ c->janitor_deadline = time(NULL) + child_mourning_time; + } else { + /* weird. Are we multithreaded now? we don't know this child */ + syslog(LOG_WARNING, +@@ -924,7 +926,7 @@ + c = get_centry(); + c->pid = pid; + c->service_state = SERVICE_STATE_DEAD; +- c->janitor_deadline = time(NULL) + 2; ++ c->janitor_deadline = time(NULL) + child_mourning_time; + c->si = SERVICE_NONE; + c->next = ctable[pid % child_table_size]; + ctable[pid % child_table_size] = c; +@@ -1079,6 +1081,36 @@ + } + } + ++/* ++ * Receives a message from a service. ++ * ++ * Returns zero if all goes well ++ * 1 if no msg available ++ * 2 if bad message received (incorrectly sized) ++ * -1 on error (errno set) ++ */ ++int read_msg(int fd, struct notify_message *msg) ++{ ++ ssize_t r; ++ size_t off = 0; ++ int s = sizeof(struct notify_message); ++ ++ while (s > 0) { ++ do ++ r = read(fd, msg + off, s); ++ while ((r == -1) && (errno == EINTR)); ++ if (r <= 0) break; ++ s -= r; ++ off += r; ++ } ++ if ( ((r == 0) && (off == 0)) || ++ ((r == -1) && (errno == EAGAIN)) ) ++ return 1; ++ if (r == -1) return -1; ++ if (s != 0) return 2; ++ return 0; ++} ++ + void process_msg(const int si, struct notify_message *msg) + { + struct centry *c; +@@ -1392,8 +1424,9 @@ + snprintf(buf, sizeof(buf), + "cannot find executable for service '%s'", name); + +- /* if it is not, we're misconfigured, die. */ +- fatal(buf, EX_CONFIG); ++ /* if it is not, we just skip it */ ++ syslog(LOG_WARNING, "WARNING: %s -- ignored", buf); ++ return; + } + + Services[i].maxforkrate = maxforkrate; +@@ -1405,7 +1438,7 @@ + Services[i].desired_workers = prefork; + Services[i].babysit = babysit; + Services[i].max_workers = atoi(max); +- if (Services[i].max_workers == -1) { ++ if (Services[i].max_workers < 0) { + Services[i].max_workers = INT_MAX; + } + } else { +@@ -1413,6 +1446,7 @@ + if (prefork > 1) prefork = 1; + Services[i].desired_workers = prefork; + Services[i].max_workers = 1; ++ Services[i].babysit = 0; + } + free(max); + +@@ -1452,7 +1486,7 @@ + if (!cmd) { + char buf[256]; + snprintf(buf, sizeof(buf), +- "unable to find command or port for event '%s'", name); ++ "unable to find command for event '%s'", name); + + if (ignore_err) { + syslog(LOG_WARNING, "WARNING: %s -- ignored", buf); +@@ -1506,7 +1540,7 @@ + + rl.rlim_cur = x; + rl.rlim_max = x; +- if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) { ++ if (setrlimit(RLIMIT_NUMFDS, &rl) < 0 && x != RLIM_INFINITY) { + syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x); + + #ifdef HAVE_GETRLIMIT +@@ -1521,11 +1555,9 @@ + } + + +- if (verbose > 1) { +- r = getrlimit(RLIMIT_NUMFDS, &rl); +- syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld", rl.rlim_cur, +- rl.rlim_max); +- } ++ if (verbose > 1 && getrlimit(RLIMIT_NUMFDS, &rl) >=0) ++ syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld", ++ rl.rlim_cur, rl.rlim_max); + #else + } + #endif /* HAVE_GETRLIMIT */ +@@ -1544,7 +1576,10 @@ + + /* disable all services - + they will be re-enabled if they appear in config file */ +- for (i = 0; i < nservices; i++) Services[i].exec = NULL; ++ for (i = 0; i < nservices; i++) { ++ if (Services[i].exec) free((void*)Services[i].exec); ++ Services[i].exec = NULL; ++ } + + /* read services */ + masterconf_getsection("SERVICES", &add_service, (void*) 1); +@@ -1559,13 +1594,18 @@ + Services[i].stat[0], Services[i].stat[1]); + + /* Only free the service info on the primary */ +- if(Services[i].associate == 0) { ++ if (Services[i].associate == 0) { ++ free(Services[i].name); + free(Services[i].listen); + free(Services[i].proto); + } ++ Services[i].name = NULL; + Services[i].listen = NULL; + Services[i].proto = NULL; + Services[i].desired_workers = 0; ++ Services[i].nforks = 0; ++ Services[i].nactive = 0; ++ Services[i].nconnections = 0; + + /* send SIGHUP to all children */ + for (j = 0 ; j < child_table_size ; j++ ) { +@@ -1648,9 +1688,9 @@ + p = getenv("CYRUS_VERBOSE"); + if (p) verbose = atoi(p) + 1; + #ifdef HAVE_NETSNMP +- while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:P:x:")) != EOF) { ++ while ((opt = getopt(argc, argv, "C:M:p:l:DdjJ:P:x:")) != EOF) { + #else +- while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:")) != EOF) { ++ while ((opt = getopt(argc, argv, "C:M:p:l:DdjJ:")) != EOF) { + #endif + switch (opt) { + case 'C': /* alt imapd.conf file */ +@@ -1683,8 +1723,15 @@ + /* Janitor frequency */ + janitor_frequency = atoi(optarg); + if(janitor_frequency < 1) +- fatal("The janitor period must be at least 1 second", EX_CONFIG); ++ fatal("The janitor frequency must be at least once per second", EX_CONFIG); + break; ++ case 'J': ++ /* Janitor delay before cleanup of a child */ ++ child_mourning_time = atoi(optarg); ++ if(child_mourning_time < 1) ++ fatal("The janitor's mourning time interval must be at least 1 second", ++ EX_CONFIG); ++ break; + #ifdef HAVE_NETSNMP + case 'P': /* snmp AgentXPingInterval */ + agentxpinginterval = atoi(optarg); +@@ -2060,13 +2107,19 @@ + int j; + + if (FD_ISSET(x, &rfds)) { +- r = read(x, &msg, sizeof(msg)); +- if (r != sizeof(msg)) { +- syslog(LOG_ERR, "got incorrectly sized response from child: %x", i); ++ while ((r = read_msg(x, &msg)) == 0) ++ process_msg(i, &msg); ++ ++ if (r == 2) { ++ syslog(LOG_ERR, ++ "got incorrectly sized response from child: %x", i); ++ continue; ++ } ++ if (r < 0) { ++ syslog(LOG_ERR, ++ "error while receiving message from child %x: %m", i); + continue; + } +- +- process_msg(i, &msg); + } + + if (Services[i].exec && +diff -urNad complete.dpatch/master/master.h /tmp/dpep.NKIIR9/complete.dpatch/master/master.h +--- complete.dpatch/master/master.h 2005-11-11 17:03:03.000000000 +0100 ++++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.h 2005-11-11 17:03:04.650994659 +0100 +@@ -43,6 +43,7 @@ + extern struct service *Services; + extern int allocservices; + extern int nservices; ++void sighandler_setup(void); + + /* + * Description of multiple address family support from --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/77-change-missing-sieve-notice.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 77-change-missing-sieve-notice.dpatch.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change the wording of sieved's notice when a user's default sieve +## DP: script is missing + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/sieve/script.c /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c +--- cyrus-imapd-2.2.13/sieve/script.c 2005-03-12 23:09:22.000000000 +0100 ++++ /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c 2006-08-21 23:31:25.979899091 +0200 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "xmalloc.h" + +@@ -418,7 +419,11 @@ + if (!fname || !ret) return SIEVE_FAIL; + + if (stat(fname, &sbuf) == -1) { +- syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname); ++ if (errno == ENOENT) { ++ syslog(LOG_DEBUG, "WARNING: sieve script %s doesn't exist: %m", fname); ++ } else { ++ syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname); ++ } + return SIEVE_FAIL; + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09-kerberos-ipv4-ipv6-kludge-removal.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove a kludge which turned IPv4 addresses in IPv6 address space back +## DP: into real IPv4 addresses. + +@DPATCH@ +diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c +--- complete.dpatch/imap/pop3d.c 2005-11-11 00:11:13.000000000 +0100 ++++ /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c 2005-11-11 00:15:17.166894681 +0100 +@@ -522,41 +522,6 @@ + } + + #ifdef HAVE_KRB +-/* translate IPv4 mapped IPv6 address to IPv4 address */ +-#ifdef IN6_IS_ADDR_V4MAPPED +-static void sockaddr_unmapped(struct sockaddr *sa, socklen_t *len) +-{ +- struct sockaddr_in6 *sin6; +- struct sockaddr_in *sin4; +- uint32_t addr; +- int port; +- +- if (sa->sa_family != AF_INET6) +- return; +- sin6 = (struct sockaddr_in6 *)sa; +- if (!IN6_IS_ADDR_V4MAPPED((&sin6->sin6_addr))) +- return; +- sin4 = (struct sockaddr_in *)sa; +- addr = *(uint32_t *)&sin6->sin6_addr.s6_addr[12]; +- port = sin6->sin6_port; +- memset(sin4, 0, sizeof(struct sockaddr_in)); +- sin4->sin_addr.s_addr = addr; +- sin4->sin_port = port; +- sin4->sin_family = AF_INET; +-#ifdef HAVE_SOCKADDR_SA_LEN +- sin4->sin_len = sizeof(struct sockaddr_in); +-#endif +- *len = sizeof(struct sockaddr_in); +-} +-#else +-static void sockaddr_unmapped(struct sockaddr *sa __attribute__((unused)), +- socklen_t *len __attribute__((unused))) +-{ +- return; +-} +-#endif +- +- + /* + * MIT's kludge of a kpop protocol + * Client does a krb_sendauth() first thing --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/12-fix_timeout_handling.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/12-fix_timeout_handling.dpatch @@ -0,0 +1,457 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12-fix_timeout_handling.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fixes timeout handling + +@DPATCH@ +diff -urNad complete.dpatch/imap/signals.c /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c +--- complete.dpatch/imap/signals.c 2005-02-14 17:26:50.000000000 +0100 ++++ /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c 2005-11-11 14:10:07.056723830 +0100 +@@ -50,7 +50,7 @@ + #include "xmalloc.h" + #include "exitcodes.h" + +-static int gotsignal = 0; ++static volatile int gotsignal = 0; + + static void sighandler(int sig) + { +diff -urNad complete.dpatch/lib/lock.h /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h +--- complete.dpatch/lib/lock.h 2003-02-13 21:15:40.000000000 +0100 ++++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h 2005-11-11 14:10:07.056723830 +0100 +@@ -53,6 +53,8 @@ + + #include + ++extern int lock_wait_time; ++ + extern const char *lock_method_desc; + + extern int lock_reopen P((int fd, const char *filename, +diff -urNad complete.dpatch/lib/lock_fcntl.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c +--- complete.dpatch/lib/lock_fcntl.c 2003-02-13 21:15:40.000000000 +0100 ++++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c 2005-11-11 14:10:07.057723732 +0100 +@@ -47,11 +47,43 @@ + #include + #include + #include ++#include ++#include + + #include "lock.h" + + const char *lock_method_desc = "fcntl"; + ++int lock_wait_time = LOCK_GIVEUP_TIMER_DEFAULT; ++ ++/* Signal handling. We REQUIRE SYSV abort-syscall behaviour */ ++ ++static volatile int lock_gotsigalrm = 0; ++void lock_sigalrm_handler(int sig __attribute__((unused))) ++{ ++ lock_gotsigalrm = 1; ++} ++ ++static int setsigalrm(int enable) ++{ ++ struct sigaction action; ++ ++ sigemptyset(&action.sa_mask); ++ action.sa_flags = SA_RESETHAND; ++ ++ if(enable) { ++ action.sa_handler = lock_sigalrm_handler; ++ } else { ++ action.sa_handler = SIG_IGN; ++ } ++ if (sigaction(SIGALRM, &action, NULL) < 0) { ++ syslog(LOG_ERR, "installing SIGALRM handler: sigaction: %m"); ++ return -1; ++ } ++ lock_gotsigalrm = 0; ++ return 0; ++} ++ + /* + * Block until we obtain an exclusive lock on the file descriptor 'fd', + * opened for reading and writing on the file named 'filename'. If +@@ -65,12 +97,10 @@ + * 'failaction' is provided, it is filled in with a pointer to a fixed + * string naming the action that failed. + * ++ * We use POSIX semanthics and alarm() to avoid deadlocks ++ * + */ +-int lock_reopen(fd, filename, sbuf, failaction) +-int fd; +-const char *filename; +-struct stat *sbuf; +-const char **failaction; ++int lock_reopen (int fd, const char *filename, struct stat *sbuf, const char **failaction) + { + int r; + struct flock fl; +@@ -79,6 +109,8 @@ + + if (!sbuf) sbuf = &sbufspare; + ++ setsigalrm(1); ++ alarm(lock_wait_time); + for (;;) { + fl.l_type= F_WRLCK; + fl.l_whence = SEEK_SET; +@@ -86,8 +118,10 @@ + fl.l_len = 0; + r = fcntl(fd, F_SETLKW, &fl); + if (r == -1) { +- if (errno == EINTR) continue; +- if (failaction) *failaction = "locking"; ++ if (errno == EINTR && !lock_gotsigalrm) continue; ++ if (failaction) *failaction = "locking"; ++ alarm(0); ++ setsigalrm(0); + return -1; + } + +@@ -100,10 +134,16 @@ + fl.l_start = 0; + fl.l_len = 0; + r = fcntl(fd, F_SETLKW, &fl); ++ alarm(0); ++ setsigalrm(0); + return -1; + } + +- if (sbuf->st_ino == sbuffile.st_ino) return 0; ++ if (sbuf->st_ino == sbuffile.st_ino) { ++ alarm(0); ++ setsigalrm(0); ++ return 0; ++ } + + newfd = open(filename, O_RDWR); + if (newfd == -1) { +@@ -113,11 +153,15 @@ + fl.l_start = 0; + fl.l_len = 0; + r = fcntl(fd, F_SETLKW, &fl); ++ alarm(0); ++ setsigalrm(0); + return -1; + } + dup2(newfd, fd); + close(newfd); + } ++ alarm(0); ++ setsigalrm(0); + } + + /* +@@ -125,22 +169,32 @@ + * Returns 0 for success, -1 for failure, with errno set to an + * appropriate error code. + */ +-int lock_blocking(fd) +-int fd; ++int lock_blocking(int fd) + { + int r; + struct flock fl; + ++ setsigalrm(1); ++ alarm(lock_wait_time); + for (;;) { + fl.l_type= F_WRLCK; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + r = fcntl(fd, F_SETLKW, &fl); +- if (r != -1) return 0; +- if (errno == EINTR) continue; ++ if (r != -1) { ++ alarm(0); ++ setsigalrm(0); ++ return 0; ++ } ++ if (errno == EINTR && !lock_gotsigalrm) continue; ++ alarm(0); ++ setsigalrm(0); + return -1; + } ++ alarm(0); ++ setsigalrm(0); ++ return 0; + } + + /* +@@ -148,22 +202,32 @@ + * Returns 0 for success, -1 for failure, with errno set to an + * appropriate error code. + */ +-int lock_shared(fd) +-int fd; ++int lock_shared(int fd) + { + int r; + struct flock fl; + ++ setsigalrm(1); ++ alarm(lock_wait_time); + for (;;) { + fl.l_type= F_RDLCK; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + r = fcntl(fd, F_SETLKW, &fl); +- if (r != -1) return 0; +- if (errno == EINTR) continue; ++ if (r != -1) { ++ alarm(0); ++ setsigalrm(0); ++ return 0; ++ } ++ if (errno == EINTR && !lock_gotsigalrm) continue; ++ alarm(0); ++ setsigalrm(0); + return -1; + } ++ alarm(0); ++ setsigalrm(0); ++ return 0; + } + + /* +@@ -171,8 +235,7 @@ + * Returns 0 for success, -1 for failure, with errno set to an + * appropriate error code. + */ +-int lock_nonblocking(fd) +-int fd; ++int lock_nonblocking(int fd) + { + int r; + struct flock fl; +@@ -187,10 +250,13 @@ + if (errno == EINTR) continue; + return -1; + } ++ return 0; + } + + /* +- * Release any lock on 'fd'. Always returns success. ++ * Release any lock on 'fd' ++ * Returns 0 for success, -1 for failure, with errno set to an ++ * appropriate error code. + */ + int lock_unlock(int fd) + { +@@ -209,5 +275,6 @@ + /* xxx help! */ + return -1; + } ++ return 0; + } + +diff -urNad complete.dpatch/lib/lock_flock.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c +--- complete.dpatch/lib/lock_flock.c 2003-02-13 21:15:41.000000000 +0100 ++++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c 2005-11-11 14:10:07.057723732 +0100 +@@ -46,6 +46,8 @@ + #include + #include + #include ++#include ++#include + #ifdef HAVE_UNISTD_H + #include + #endif +@@ -54,6 +56,36 @@ + + const char *lock_method_desc = "flock"; + ++int lock_wait_time = LOCK_GIVEUP_TIMER_DEFAULT; ++ ++/* Signal handling. We REQUIRE SYSV abort-syscall behaviour */ ++ ++static volatile int lock_gotsigalrm = 0; ++void lock_sigalrm_handler(int sig __attribute__((unused))) ++{ ++ lock_gotsigalrm = 1; ++} ++ ++static int setsigalrm(int enable) ++{ ++ struct sigaction action; ++ ++ sigemptyset(&action.sa_mask); ++ action.sa_flags = SA_RESETHAND; ++ ++ if(enable) { ++ action.sa_handler = lock_sigalrm_handler; ++ } else { ++ action.sa_handler = SIG_IGN; ++ } ++ if (sigaction(SIGALRM, &action, NULL) < 0) { ++ syslog(LOG_ERR, "installing SIGALRM handler: sigaction: %m"); ++ return -1; ++ } ++ lock_gotsigalrm = 0; ++ return 0; ++} ++ + /* + * Block until we obtain an exclusive lock on the file descriptor 'fd', + * opened for reading and writing on the file named 'filename'. If +@@ -67,12 +99,10 @@ + * 'failaction' is provided, it is filled in with a pointer to a fixed + * string naming the action that failed. + * ++ * We use POSIX semanthics and alarm() to avoid deadlocks ++ * + */ +-int lock_reopen(fd, filename, sbuf, failaction) +-int fd; +-const char *filename; +-struct stat *sbuf; +-const char **failaction; ++int lock_reopen(int fd, const char *filename, struct stat *sbuf, const char **failaction) + { + int r; + struct stat sbuffile, sbufspare; +@@ -80,11 +110,15 @@ + + if (!sbuf) sbuf = &sbufspare; + ++ setsigalrm(1); ++ alarm(lock_wait_time); + for (;;) { + r = flock(fd, LOCK_EX); + if (r == -1) { +- if (errno == EINTR) continue; ++ if (errno == EINTR && !lock_gotsigalrm) continue; + if (failaction) *failaction = "locking"; ++ alarm(0); ++ setsigalrm(0); + return -1; + } + +@@ -93,20 +127,32 @@ + if (r == -1) { + if (failaction) *failaction = "stating"; + flock(fd, LOCK_UN); ++ alarm(0); ++ setsigalrm(0); + return -1; + } + +- if (sbuf->st_ino == sbuffile.st_ino) return 0; ++ if (sbuf->st_ino == sbuffile.st_ino) { ++ alarm(0); ++ setsigalrm(0); ++ return 0; ++ } ++ + + newfd = open(filename, O_RDWR); + if (newfd == -1) { + if (failaction) *failaction = "opening"; + flock(fd, LOCK_UN); ++ alarm(0); ++ setsigalrm(0); + return -1; + } + dup2(newfd, fd); + close(newfd); + } ++ alarm(0); ++ setsigalrm(0); ++ return 0; + } + + /* +@@ -114,17 +160,27 @@ + * Returns 0 for success, -1 for failure, with errno set to an + * appropriate error code. + */ +-int lock_blocking(fd) +-int fd; ++int lock_blocking(int fd) + { + int r; + ++ setsigalrm(1); ++ alarm(lock_wait_time); + for (;;) { + r = flock(fd, LOCK_EX); +- if (r != -1) return 0; +- if (errno == EINTR) continue; ++ if (r != -1) { ++ alarm(0); ++ setsigalrm(0); ++ return 0; ++ } ++ if (errno == EINTR && !lock_gotsigalrm) continue; ++ alarm(0); ++ setsigalrm(0); + return -1; + } ++ alarm(0); ++ setsigalrm(0); ++ return 0; + } + + /* +@@ -132,17 +188,27 @@ + * Returns 0 for success, -1 for failure, with errno set to an + * appropriate error code. + */ +-int lock_shared(fd) +-int fd; ++int lock_shared(int fd) + { + int r; + ++ setsigalrm(1); ++ alarm(lock_wait_time); + for (;;) { + r = flock(fd, LOCK_SH); +- if (r != -1) return 0; +- if (errno == EINTR) continue; ++ if (r != -1) { ++ alarm(0); ++ setsigalrm(0); ++ return 0; ++ } ++ if (errno == EINTR && !lock_gotsigalrm) continue; ++ alarm(0); ++ setsigalrm(0); + return -1; + } ++ alarm(0); ++ setsigalrm(0); ++ return 0; + } + + /* +@@ -164,7 +230,9 @@ + } + + /* +- * Release any lock on 'fd'. Always returns success. ++ * Release any lock on 'fd'. ++ * Returns 0 for success, -1 for failure, with errno set to an ++ * appropriate error code. + */ + int lock_unlock(int fd) + { +@@ -174,8 +242,8 @@ + r = flock(fd, LOCK_UN); + if (r != -1) return 0; + if (errno == EINTR) continue; +- /* xxx help! */ + return -1; + } ++ return 0; + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch @@ -0,0 +1,92 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix a problem in ctl_mboxlist with remote mailboxes (it now also dumps +## DP: and undumps mailbox type flags) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html +--- cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:19:51.000000000 +0200 ++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:26:24.115155499 +0200 +@@ -8,6 +8,12 @@ + + + ++

Changes to the Cyrus IMAP Server since 2.2.13

++
    ++
  • ctl_mboxlist now dumps/undumps the mailbox type flags, ++making it useful for remote mailboxes.
    • ++
++ +

Changes to the Cyrus IMAP Server since 2.2.12

+
    +
  • Allow sieve scripts to be run on shared mailboxes (via sieve +diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c +--- cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:19:51.000000000 +0200 ++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:26:24.129154183 +0200 +@@ -187,7 +187,7 @@ + switch (d->op) { + case DUMP: + if(!d->partition || !strcmp(d->partition, part)) { +- printf("%s\t%s\t%s\n", name, part, acl); ++ printf("%s\t%d %s\t%s\n", name, mbtype, part, acl); + if(d->purge) { + config_mboxlist_db->delete(mbdb, key, keylen, &(d->tid), 0); + } +@@ -490,7 +490,7 @@ + while (fgets(buf, sizeof(buf), stdin)) { + char *name, *partition, *acl; + char *p; +- int tries = 0; ++ int mbtype = 0, tries = 0; + + line++; + +@@ -501,6 +501,12 @@ + continue; + } + *p++ = '\0'; ++ if (isdigit((int) *p)) { ++ /* new style dump */ ++ mbtype = strtol(p, &p, 10); ++ /* skip trailing space */ ++ if (*p == ' ') p++; ++ } + partition = p; + for (; *p && *p != '\t'; p++) ; + if (!*p) { +@@ -523,7 +529,7 @@ + } + + key = name; keylen = strlen(key); +- data = mboxlist_makeentry(0, partition, acl); datalen = strlen(data); ++ data = mboxlist_makeentry(mbtype, partition, acl); datalen = strlen(data); + + tries = 0; + retry: +diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8 +--- cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:19:51.000000000 +0200 ++++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:26:24.125154559 +0200 +@@ -104,7 +104,9 @@ + .TP + .B \-d + Dump the contents of the database to standard output in a portable +-flat-text format. ++flat-text format. NOTE: In Cyrus versions 2.2.13 and earlier, the dump ++format did not include the mailbox type flags, breaking remote ++mailboxes (frontends, mupdate master) when undumped. + .TP + .B \-x + When performing a dump, remove the mailboxes dumped from the mailbox list +@@ -115,7 +117,9 @@ + .TP + .B \-u + Load the contents of the database from standard input. The input MUST +-be in the format output using the \fB\-d\fR option. ++be in the format output using the \fB\-d\fR option. NOTE: Both the ++old and new formats can be loaded, but the old format will break ++remote mailboxes. + .TP + .B \-m + For backend servers in the Cyrus Murder, synchronize the local mailbox list --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0008-upstream-better-message-track-logging.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch @@ -0,0 +1,114 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0008-upstream-better-message-track-logging by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: better logging to facilitate message tracking (Wes Craig ) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/lmtp_sieve.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtp_sieve.c +--- cyrus-imapd-2.2.13/imap/lmtp_sieve.c 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtp_sieve.c 2006-05-12 12:17:52.579503152 +0200 +@@ -1,6 +1,6 @@ + /* lmtp_sieve.c -- Sieve implementation for lmtpd + * +- * $Id: lmtp_sieve.c,v 1.11 2005/11/21 16:26:16 murch Exp $ ++ * $Id: lmtp_sieve.c,v 1.12 2006/05/10 16:27:17 murch Exp $ + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -327,6 +327,8 @@ + sievedb, strlen(sievedb), time(NULL), 0); + + snmp_increment(SIEVE_REDIRECT, 1); ++ syslog(LOG_INFO, "sieve redirected: %s to: %s", ++ m->id ? m->id : "", rc->addr); + return SIEVE_OK; + } else { + if (res == -1) { +@@ -349,17 +351,8 @@ + snmp_increment(SIEVE_DISCARD, 1); + + /* ok, we won't file it, but log it */ +- if (md->id && strlen(md->id) < 80) { +- char pretty[160]; +- +- beautify_copy(pretty, md->id); +- syslog(LOG_INFO, "sieve: discarded message to %s id %s", +- sd->username, pretty); +- } +- else { +- syslog(LOG_INFO, "sieve: discarded message to %s", +- sd->username); +- } ++ syslog(LOG_INFO, "sieve discarded: %s", ++ md->id ? md->id : ""); + + return SIEVE_OK; + } +@@ -383,7 +376,7 @@ + + if (strlen(md->return_path) == 0) { + syslog(LOG_INFO, "sieve: discarded reject to <> for %s id %s", +- sd->username, md->id); ++ sd->username, md->id ? md->id : ""); + return SIEVE_OK; + } + +@@ -393,6 +386,8 @@ + origreceip, sd->username, + rc->msg, md->data)) == 0) { + snmp_increment(SIEVE_REJECT, 1); ++ syslog(LOG_INFO, "sieve rejected: %s to: %s", ++ md->id ? md->id : "", md->return_path); + return SIEVE_OK; + } else { + if (res == -1) { +diff -urNad cyrus-imapd-2.2.13/imap/lmtpd.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtpd.c +--- cyrus-imapd-2.2.13/imap/lmtpd.c 2006-05-06 10:34:48.000000000 +0200 ++++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtpd.c 2006-05-12 12:17:52.578503246 +0200 +@@ -1,6 +1,6 @@ + /* lmtpd.c -- Program to deliver mail to a mailbox + * +- * $Id: lmtpd.c,v 1.143 2006/01/20 20:29:33 jeaton Exp $ ++ * $Id: lmtpd.c,v 1.144 2006/05/10 16:27:17 murch Exp $ + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -321,6 +321,7 @@ + strlen(mailboxname), now, uid); + + append_commit(&as, quotaoverride ? -1 : 0, NULL, &uid, NULL); ++ syslog(LOG_INFO, "Delivered: %s to mailbox: %s", id, mailboxname); + } + } + +diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c +--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-05-06 10:34:48.000000000 +0200 ++++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c 2006-05-12 12:17:52.581502964 +0200 +@@ -1,5 +1,5 @@ + /* mailbox.c -- Mailbox manipulation routines +- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $ ++ * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $ + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -1931,6 +1931,11 @@ + } + } + ++ if (numdeleted > 0) { ++ syslog(LOG_NOTICE, "Expunged %d messages from %s", ++ numdeleted, mailbox->name); ++ } ++ + free(buf); + if (deleted) free(deleted); + +@@ -2187,6 +2192,7 @@ + *tail = '\0'; + } while (rmdir(buf) == 0 && (tail = strrchr(buf, '/'))); + ++ syslog(LOG_NOTICE, "Deleted mailbox %s", mailbox->name); + mailbox_close(mailbox); + return 0; + } --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/14-xmalloc.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/14-xmalloc.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 14-xmalloc.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix xmalloc usage + +@DPATCH@ +diff -urNad complete.dpatch/lib/map_stupidshared.c /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c +--- complete.dpatch/lib/map_stupidshared.c 2003-10-22 20:50:12.000000000 +0200 ++++ /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c 2005-11-11 14:29:02.586035529 +0100 +@@ -52,6 +52,7 @@ + #include + #include + ++#include "xmalloc.h" + #include "map.h" + #include "exitcodes.h" + +diff -urNad complete.dpatch/lib/xmalloc.h /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h +--- complete.dpatch/lib/xmalloc.h 2003-10-22 20:50:12.000000000 +0200 ++++ /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h 2005-11-11 14:29:30.174327237 +0100 +@@ -65,7 +65,7 @@ + + /* Functions using xmalloc.h must provide a function called fatal() conforming + to the following: */ +-extern void fatal(const char *fatal_message, int fatal_code); +-/* __attribute__ ((noreturn));*/ ++extern void fatal(const char *fatal_message, int fatal_code) ++ __attribute__ ((noreturn)); + + #endif /* INCLUDED_XMALLOC_H */ --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/23-configurable_idled.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/23-configurable_idled.dpatch @@ -0,0 +1,508 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23-configurable_idled.dpatch by Ondřej Surý +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds imapd.conf option to select IDLE method at runtime + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in +--- cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:47.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:56.178920138 +0200 +@@ -760,9 +760,6 @@ + METHOD is [poll], idled or no], + WITH_IDLE="${withval}",WITH_IDLE="poll") + AC_SUBST(WITH_IDLE) +-if test "$WITH_IDLE" = "idled"; then +- IMAP_PROGS="$IMAP_PROGS idled" +-fi + + dnl + dnl see if we're compiling with NNTP support +diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in +--- cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:47.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:56.178920138 +0200 +@@ -47,9 +47,6 @@ + # 'local' (legacy flat file). + SEEN=seen_db.o + +-# IMAP IDLE mechanism +-IDLE=idle_@WITH_IDLE@.o +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -104,7 +101,8 @@ + convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ + annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ + imapparse.o telemetry.o user.o notify.o protocol.o quota_db.o \ +- $(SEEN) $(IDLE) ++ idle.o idle_no.o idle_poll.o idle_idled.o \ ++ $(SEEN) + + IMAPDOBJS=pushstats.o backend.o imapd.o index.o tls.o version.o + +@@ -118,7 +116,7 @@ + SERVICE=../master/service.o + SERVICETHREAD=../master/service-thread.o + +-PROGS = imapd lmtpd pop3d \ ++PROGS = imapd lmtpd pop3d idled \ + fud smmapd reconstruct quota mbpath ipurge \ + cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ + ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ +diff -urNad cyrus-imapd-2.2.13/imap/global.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c +--- cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:13:47.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:28:28.243411698 +0200 +@@ -72,6 +72,7 @@ + #include "prot.h" /* for PROT_BUFSIZE */ + #include "util.h" + #include "xmalloc.h" ++#include "idle.h" + + static enum { + NOT_RUNNING = 0, +@@ -94,6 +95,8 @@ + /* syslog prefix tag */ + static char syslog_prefix[20]; + ++struct idle_backend *config_idle=NULL; ++ + /* Called before a cyrus application starts (but after command line parameters + * are read) */ + int cyrus_init(const char *alt_config, const char *ident, unsigned flags) +@@ -185,6 +188,10 @@ + config_ptscache_db = + cyrusdb_fromname(config_getstring(IMAPOPT_PTSCACHE_DB)); + ++ /* lookup idle backend */ ++ config_idle = ++ idle_fromname(config_getstring(IMAPOPT_IDLEMETHOD)); ++ + /* configure libcyrus as needed */ + libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir); + libcyrus_config_setswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE, +diff -urNad cyrus-imapd-2.2.13/imap/global.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h +--- cyrus-imapd-2.2.13/imap/global.h 2006-08-21 23:32:39.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h 2006-08-23 18:13:56.179920040 +0200 +@@ -152,4 +152,6 @@ + extern struct cyrusdb_backend *config_tlscache_db; + extern struct cyrusdb_backend *config_ptscache_db; + ++extern struct idle_backend *config_idle; ++ + #endif /* INCLUDED_GLOBAL_H */ +diff -urNad cyrus-imapd-2.2.13/imap/idle.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c +--- cyrus-imapd-2.2.13/imap/idle.c 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c 2006-08-23 18:13:56.179920040 +0200 +@@ -0,0 +1,87 @@ ++/* ++ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. The name "Carnegie Mellon University" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For permission or any other legal ++ * details, please contact ++ * Office of Technology Transfer ++ * Carnegie Mellon University ++ * 5000 Forbes Avenue ++ * Pittsburgh, PA 15213-3890 ++ * (412) 268-4387, fax: (412) 268-7395 ++ * tech-transfer@andrew.cmu.edu ++ * ++ * 4. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by Computing Services ++ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." ++ * ++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO ++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE ++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* $Id: idle.c,v 1.10 2006/01/04 02:06:23 ondrej Exp $ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "makedepend/def.h" ++ ++#include "idle.h" ++#include "exitcodes.h" ++ ++struct idle_backend *idle_backends[] = { ++ &id_bk_no, ++ &id_bk_poll, ++ &id_bk_idled, ++ NULL }; ++ ++struct idle_backend *idle_fromname(const char *name) ++{ ++ int i; ++ struct idle_backend *idle = NULL; ++ ++ for (i = 0; idle_backends[i]; i++) { ++ if (!strcmp(idle_backends[i]->name, name)) { ++ idle = idle_backends[i]; ++ break; ++ } ++ } ++ if (!idle) { ++ char errbuf[1024]; ++ snprintf(errbuf, sizeof(errbuf), ++ "idle backend %s not supported", name); ++ fatal(errbuf, EC_CONFIG); ++ } ++ ++ return idle; ++} +diff -urNad cyrus-imapd-2.2.13/imap/idle.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h +--- cyrus-imapd-2.2.13/imap/idle.h 2006-08-21 23:32:39.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h 2006-08-23 18:13:56.180919942 +0200 +@@ -44,8 +44,7 @@ + #define IDLE_H + + #include "mailbox.h" +- +-extern const char *idle_method_desc; ++#include "global.h" + + typedef enum { + IDLE_MAILBOX = 0x1, +@@ -54,20 +53,43 @@ + + typedef void idle_updateproc_t(idle_flags_t flags); + ++struct idle_backend { ++ const char *name; + +-/* Is IDLE enabled? Can also do initial setup, if necessary */ +-int idle_enabled(void); ++ /* Is IDLE enabled? Can also do initial setup, if necessary */ ++ int (*enabled)(void); + +-/* Setup for IDLE. +- * 'proc' is a pointer to a function which reports mailbox updates and/or +- * ALERTs to the client. +- */ +-int idle_init(idle_updateproc_t *proc); ++ /* Setup for IDLE. ++ * 'proc' is a pointer to a function which reports mailbox updates and/or ++ * ALERTs to the client. ++ */ ++ int (*init)(idle_updateproc_t *proc); + +-/* Start IDLEing on 'mailbox'. */ +-void idle_start(struct mailbox *mailbox); ++ /* Start IDLEing on 'mailbox'. */ ++ void (*start)(struct mailbox *mailbox); + +-/* Cleanup when IDLE is completed. */ +-void idle_done(struct mailbox *mailbox); ++ /* Cleanup when IDLE is completed. */ ++ void (*done)(struct mailbox *mailbox); ++}; ++ ++/* Defines to simulate old behaviour */ ++/* see struct definition above to see what they do */ ++ ++#define idle_enabled() (config_idle?config_idle->enabled():0) ++#define idle_init(proc) (config_idle?config_idle->init(proc):0) ++#define idle_start(mbox) (config_idle?config_idle->start(mbox):0) ++#define idle_done(mbox) (config_idle?config_idle->done(mbox):0) ++#define idle_method_desc (config_idle?config_idle->name:NULL) ++ ++extern struct idle_backend *idle_backends[]; ++ ++/* Note that some of these may be undefined symbols ++ * if imapd was not built with support for them */ ++extern struct idle_backend id_bk_no; ++extern struct idle_backend id_bk_poll; ++extern struct idle_backend id_bk_idled; ++ ++/* Configuration */ ++struct idle_backend *idle_fromname(const char *name); + + #endif +diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c +--- cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:47.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:56.180919942 +0200 +@@ -58,8 +58,6 @@ + #include "idled.h" + #include "global.h" + +-const char *idle_method_desc = "idled"; +- + /* function to report mailbox updates to the client */ + static idle_updateproc_t *idle_update = NULL; + +@@ -73,14 +71,14 @@ + static int idle_remote_len = 0; + + /* Forward declarations */ +-int idle_send_msg(int msg, struct mailbox *mailbox); +-void idle_notify(struct mailbox *mailbox); ++static int idle_send_msg(int msg, struct mailbox *mailbox); ++static void idle_notify(struct mailbox *mailbox); + + + /* + * Create connection to idled for sending notifications + */ +-int idle_enabled(void) ++static int idle_idled_enabled(void) + { + int s; + int fdflags; +@@ -154,7 +152,10 @@ + } + } + +-int idle_init(idle_updateproc_t *proc) ++/* forward declaration */ ++static void idle_idled_done(struct mailbox *mailbox); ++ ++static int idle_idled_init(idle_updateproc_t *proc) + { + struct sigaction action; + +@@ -177,14 +178,14 @@ + syslog(LOG_ERR, "sigaction: %m"); + + /* Cancel receiving signals */ +- idle_done(NULL); ++ idle_idled_done(NULL); + return 0; + } + + return 1; + } + +-void idle_start(struct mailbox *mailbox) ++static void idle_idled_start(struct mailbox *mailbox) + { + idle_started = 1; + +@@ -195,7 +196,7 @@ + } + } + +-void idle_done(struct mailbox *mailbox) ++static void idle_idled_done(struct mailbox *mailbox) + { + /* Tell idled that we're done idling */ + idle_send_msg(IDLE_DONE, mailbox); +@@ -212,7 +213,7 @@ + /* + * Send a message to idled + */ +-int idle_send_msg(int msg, struct mailbox *mailbox) ++static int idle_send_msg(int msg, struct mailbox *mailbox) + { + idle_data_t idledata; + +@@ -235,10 +236,21 @@ + /* + * Notify imapidled of a mailbox change + */ +-void idle_notify(struct mailbox *mailbox) ++static void idle_notify(struct mailbox *mailbox) + { + /* We should try to determine if we need to send this + * (ie, is an imapd is IDLE on 'mailbox'?). + */ + idle_send_msg(IDLE_NOTIFY, mailbox); + } ++ ++struct idle_backend id_bk_idled = ++{ ++ "idled", /* name */ ++ ++ &idle_idled_enabled, ++ &idle_idled_init, ++ ++ &idle_idled_start, ++ &idle_idled_done ++}; +diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c +--- cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-21 23:32:39.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-23 18:13:56.181919844 +0200 +@@ -42,23 +42,31 @@ + + #include "idle.h" + +- +-const char *idle_method_desc = (char *)0; +- +-int idle_enabled(void) ++static int idle_no_enabled(void) + { + return 0; + } + +-int idle_init(idle_updateproc_t *proc) ++static int idle_no_init(idle_updateproc_t *proc) + { + return 0; + } + +-void idle_start(struct mailbox *mailbox) ++static void idle_no_start(struct mailbox *mailbox __attribute__((unused))) + { + } + +-void idle_done(struct mailbox *mailbox) ++static void idle_no_done(struct mailbox *mailbox __attribute__((unused))) + { + } ++ ++struct idle_backend id_bk_no = ++{ ++ "no", /* name */ ++ ++ &idle_no_enabled, ++ &idle_no_init, ++ ++ &idle_no_start, ++ &idle_no_done ++}; +diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c +--- cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-21 23:32:39.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-23 18:13:56.181919844 +0200 +@@ -51,15 +51,13 @@ + #include "idle.h" + #include "global.h" + +-const char *idle_method_desc = "poll"; +- + /* function to report mailbox updates to the client */ + static idle_updateproc_t *idle_update = NULL; + + /* how often to poll the mailbox */ + static time_t idle_period = -1; + +-int idle_enabled(void) ++static int idle_poll_enabled(void) + { + /* get polling period */ + if (idle_period == -1) { +@@ -78,7 +76,10 @@ + alarm(idle_period); + } + +-int idle_init(idle_updateproc_t *proc) ++/* forward declaration */ ++static void idle_poll_done(struct mailbox *mailbox __attribute__((unused))); ++ ++static int idle_poll_init(idle_updateproc_t *proc) + { + struct sigaction action; + +@@ -96,22 +97,33 @@ + syslog(LOG_ERR, "sigaction: %m"); + + /* Cancel receiving signals */ +- idle_done(NULL); ++ idle_poll_done(NULL); + return 0; + } + + return 1; + } + +-void idle_start(struct mailbox *mailbox __attribute__((unused))) ++static void idle_poll_start(struct mailbox *mailbox __attribute__((unused))) + { + alarm(idle_period); + } + +-void idle_done(struct mailbox *mailbox __attribute__((unused))) ++static void idle_poll_done(struct mailbox *mailbox __attribute__((unused))) + { + /* Remove the polling function */ + signal(SIGALRM, SIG_IGN); + + idle_update = NULL; + } ++ ++struct idle_backend id_bk_poll = ++{ ++ "poll", /* name */ ++ ++ &idle_poll_enabled, ++ &idle_poll_init, ++ ++ &idle_poll_start, ++ &idle_poll_done ++}; +diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c +--- cyrus-imapd-2.2.13/imap/version.c 2006-08-21 23:32:39.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c 2006-08-23 18:13:56.181919844 +0200 +@@ -62,6 +62,7 @@ + #include "map.h" + #include "lock.h" + #include "nonblock.h" ++#include "global.h" + #include "idle.h" + + #ifdef USE_SIEVE +diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in +--- cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:47.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:56.182919747 +0200 +@@ -74,6 +74,8 @@ + + libdir = @libdir@ + ++IDLE = @WITH_IDLE@ ++ + BUILTSOURCES = imapopts.h imapopts.c + + LIBCYR_HDRS = $(srcdir)/acl.h $(srcdir)/assert.h $(srcdir)/auth.h \ +@@ -132,7 +134,7 @@ + $(RANLIB) libcyrus_min.a + + imapopts.c: imapoptions $(srcdir)/../tools/config2header +- $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions ++ sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h + + imapopts.h: imapopts.c + +diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions +--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:47.000000000 +0200 ++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:56.182919747 +0200 +@@ -248,6 +248,9 @@ + /* The password to use for authentication to the backend server hostname + (where hostname is the short hostname of the server) - Cyrus Murder */ + ++{ "idlemethod", "%IDLE%", STRINGLIST("no", "poll", "idled") } ++/* The idle backend to use for IDLE command. */ ++ + { "idlesocket", "{configdirectory}/socket/idle", STRING } + /* Unix domain socket that idled listens on. */ + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0003-upstream_disallow_userprobes.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch @@ -0,0 +1,207 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0003-upstream_disallow_userprobes.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream: Disallow probing for known user names +## DP: Changes behaviour to always return "Login failed" instead of returning +## DP: "Unknown user" for unknown user names. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c +--- cyrus-imapd-2.2.13/imap/imapd.c 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c 2006-05-03 16:02:02.685827405 +0200 +@@ -1785,6 +1785,9 @@ + + sleep(3); + ++ /* Don't allow user probing */ ++ if (r == SASL_NOUSER) r = SASL_BADAUTH; ++ + if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) { + prot_printf(imapd_out, "%s NO Login failed: %s\r\n", tag, reply); + } else { +@@ -1898,8 +1901,6 @@ + break; + default: + /* failed authentication */ +- errorstring = sasl_errstring(sasl_result, NULL, NULL); +- + syslog(LOG_NOTICE, "badlogin: %s %s [%s]", + imapd_clienthost, authtype, sasl_errdetail(imapd_saslconn)); + +@@ -1908,6 +1909,10 @@ + VARIABLE_LISTEND); + sleep(3); + ++ /* Don't allow user probing */ ++ if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH; ++ ++ errorstring = sasl_errstring(sasl_result, NULL, NULL); + if (errorstring) { + prot_printf(imapd_out, "%s NO %s\r\n", tag, errorstring); + } else { +diff -urNad cyrus-imapd-2.2.13/imap/nntpd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/nntpd.c +--- cyrus-imapd-2.2.13/imap/nntpd.c 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/nntpd.c 2006-05-03 16:02:02.678828066 +0200 +@@ -2140,13 +2140,16 @@ + default: + code = 481; + } +- errorstring = sasl_errstring(sasl_result, NULL, NULL); + + syslog(LOG_NOTICE, "badlogin: %s %s [%s]", + nntp_clienthost, mech, sasl_errdetail(nntp_saslconn)); + + sleep(3); + ++ /* Don't allow user probing */ ++ if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH; ++ ++ errorstring = sasl_errstring(sasl_result, NULL, NULL); + if (errorstring) { + prot_printf(nntp_out, "%d %s\r\n", code, errorstring); + } else { +diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/pop3d.c +--- cyrus-imapd-2.2.13/imap/pop3d.c 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/pop3d.c 2006-05-03 16:02:02.679827971 +0200 +@@ -1027,15 +1027,18 @@ + /* failed authentication */ + if (sasl_result != SASL_OK) + { ++ syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s", ++ popd_clienthost, popd_apop_chal, ++ sasl_errdetail(popd_saslconn)); ++ + sleep(3); + ++ /* Don't allow user probing */ ++ if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH; ++ + prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n", + sasl_errstring(sasl_result, NULL, NULL)); + +- syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s", +- popd_clienthost, popd_apop_chal, +- sasl_errdetail(popd_saslconn)); +- + return; + } + +@@ -1292,11 +1295,6 @@ + break; + default: + /* failed authentication */ +- sleep(3); +- +- prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n", +- sasl_errstring(sasl_result, NULL, NULL)); +- + if (authtype) { + syslog(LOG_NOTICE, "badlogin: %s %s %s", + popd_clienthost, authtype, +@@ -1305,6 +1303,14 @@ + syslog(LOG_NOTICE, "badlogin: %s %s", + popd_clienthost, authtype); + } ++ ++ sleep(3); ++ ++ /* Don't allow user probing */ ++ if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH; ++ ++ prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n", ++ sasl_errstring(sasl_result, NULL, NULL)); + } + + reset_saslconn(&popd_saslconn); +diff -urNad cyrus-imapd-2.2.13/imap/proxyd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/proxyd.c +--- cyrus-imapd-2.2.13/imap/proxyd.c 2006-03-31 20:18:13.000000000 +0200 ++++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/proxyd.c 2006-05-03 16:02:02.681827782 +0200 +@@ -2106,7 +2106,7 @@ + char c; + struct buf passwdbuf; + char *passwd; +- char *reply = 0; ++ const char *reply = 0; + int r; + + if (proxyd_userid) { +@@ -2180,17 +2180,19 @@ + strlen(canon_user), + passwd, + strlen(passwd)))!=SASL_OK) { +- const char *errorstring = sasl_errstring(r, NULL, NULL); +- if (reply) { +- syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s", +- proxyd_clienthost, canon_user, reply); +- } ++ syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s", ++ proxyd_clienthost, canon_user, sasl_errdetail(proxyd_saslconn)); ++ + /* Apply penalty only if not under layer */ + if (proxyd_starttls_done == 0) + sleep(3); +- if (errorstring) { ++ ++ /* Don't allow user probing */ ++ if (r == SASL_NOUSER) r = SASL_BADAUTH; ++ ++ if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) { + prot_printf(proxyd_out, "%s NO Login failed: %s\r\n", +- tag, errorstring); ++ tag, reply); + } else { + prot_printf(proxyd_out, "%s NO Login failed.", tag); + } +@@ -2276,8 +2278,6 @@ + break; + default: + /* failed authentication */ +- errorstring = sasl_errstring(sasl_result, NULL, NULL); +- + syslog(LOG_NOTICE, "badlogin: %s %s [%s]", + proxyd_clienthost, authtype, sasl_errdetail(proxyd_saslconn)); + +@@ -2286,6 +2286,10 @@ + VARIABLE_LISTEND); + sleep(3); + ++ /* Don't allow user probing */ ++ if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH; ++ ++ errorstring = sasl_errstring(sasl_result, NULL, NULL); + if (errorstring) { + prot_printf(proxyd_out, "%s NO %s\r\n", tag, errorstring); + } else { +@@ -4253,13 +4257,13 @@ + proxyd_userid, mailboxname); + if (!r) r = mlookup(mailboxname, &server, NULL, NULL); + +- if(proxyd_userisadmin) { ++ if(!r && proxyd_userisadmin) { + /* If they are an admin, they won't retain that privledge if we + * proxy for them, so we need to refer them -- even if they haven't + * told us they're able to handle it. */ + proxyd_refer(tag, server, name); +- } else { +- if (!r) s = proxyd_findserver(server); ++ } else if (!r) { ++ s = proxyd_findserver(server); + + if (s) { + prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n", +@@ -4268,11 +4272,10 @@ + } else { + r = IMAP_SERVER_UNAVAILABLE; + } ++ } + +- if (r) { +- prot_printf(proxyd_out, "%s NO %s\r\n", tag, error_message(r)); +- return; +- } ++ if (r) { ++ prot_printf(proxyd_out, "%s NO %s\r\n", tag, error_message(r)); + } + } + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0014-upstream-fix-locks-during-reconstruction.dpatch by Benjamin Seidenberg +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream: don't lock/unlock_pop when reconstructing + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c +--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 12:59:59.000000000 +0200 ++++ /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 13:00:01.083767966 +0200 +@@ -1,5 +1,5 @@ + /* mailbox.c -- Mailbox manipulation routines +- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $ ++ * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $ + * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -1391,11 +1391,14 @@ + return r; + } + +- r = mailbox_lock_pop(mailbox); +- if (r) { +- mailbox_unlock_index(mailbox); +- mailbox_unlock_header(mailbox); +- return r; ++ if (!mailbox_doing_reconstruct) { ++ /* If we're reconstructing, we don't open the existing cache file */ ++ r = mailbox_lock_pop(mailbox); ++ if (r) { ++ mailbox_unlock_index(mailbox); ++ mailbox_unlock_header(mailbox); ++ return r; ++ } + } + + strlcpy(fnamebuf, mailbox->path, sizeof(fnamebuf)); +@@ -1499,7 +1502,7 @@ + goto fail; + } + +- mailbox_unlock_pop(mailbox); ++ if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox); + mailbox_unlock_index(mailbox); + mailbox_unlock_header(mailbox); + fclose(newindex); +@@ -1507,7 +1510,7 @@ + return 0; + + fail: +- mailbox_unlock_pop(mailbox); ++ if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox); + mailbox_unlock_index(mailbox); + mailbox_unlock_header(mailbox); + --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/30-update_perlcalling.sh.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch @@ -0,0 +1,493 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_update_perlcalling.sh.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: updates calling of the perl interpreter to what we expect in Debian. +## DP: More precisely: Call /usr/bin/perl directly instead of using some +## DP: shell magic to locate perl and run it. +## DP: NOTE: only some script use the "-w" or even the "-T" flag for perl. +## DP: This should be the default actually. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl +--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2005-05-24 22:44:39.039570899 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl5 ++#!/usr/bin/perl + + # + # Created by Alison Greenwald 21 Sep 2000 +diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl +--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2005-05-24 22:44:39.038570809 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl5 ++#!/usr/bin/perl + + # + # Created by Alison Greenwald 21 Sep 2000 +diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl +--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2005-05-24 22:44:39.038570809 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl5 ++#!/usr/bin/perl + + # + # Created by Alison Greenwald 21 Sep 2000 +diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/mupdate-test.pl +--- cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 22:44:39.048571710 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # Create a workload against a murder frontend + # that will give the MUPDATE server a workout. +diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl +--- cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 22:44:39.058572611 +0200 +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#!/usr/bin/perl -w + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl +--- cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24 22:44:39.057572521 +0200 +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#!/usr/bin/perl -w + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl +--- cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 22:44:39.059572701 +0200 +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl -w ++#!/usr/bin/perl -w + # + # $Id: imapdu.pl,v 1.8 2001/11/30 19:30:45 leg Exp $ + # +diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl +--- cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 22:44:39.057572521 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl -w ++#!/usr/bin/perl -w + + # test-imsp.pl + # +diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl +--- cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-24 22:44:39.061572881 +0200 +@@ -1,6 +1,4 @@ +-#! /bin/sh +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w ++#!/usr/bin/perl -w + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl +--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 22:44:39.062572971 +0200 +@@ -1,6 +1,4 @@ +-#! /bin/sh +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w ++#!/usr/bin/perl -w + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +diff -urNad cyrus-imapd-2.2.12/snmp/snmpgen /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen +--- cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:13:05.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:44:39.073573962 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/perl -w + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +@@ -38,25 +38,8 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w + # $Id: snmpgen,v 1.18 2005/04/11 06:08:58 shadow Exp $ + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-w", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + #Tim Martin +diff -urNad cyrus-imapd-2.2.12/tools/arbitronsort.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl +--- cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:44:39.018569008 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # + # This script takes the output of arbitron (run without the -o option) +diff -urNad cyrus-imapd-2.2.12/tools/config2header /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header +--- cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:44:39.017568918 +0200 +@@ -1,4 +1,5 @@ +-#!/bin/sh ++#!/usr/bin/perl -w ++# + # $Id: config2header,v 1.12 2005/04/19 18:54:32 shadow Exp $ + # + # Copyright (c) 2001 Carnegie Mellon University. All rights reserved. +@@ -39,24 +40,6 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w +- +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + use strict; +diff -urNad cyrus-imapd-2.2.12/tools/config2man /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man +--- cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:44:39.020569188 +0200 +@@ -1,4 +1,5 @@ +-#!/bin/sh ++#!/usr/bin/perl -w ++# + # $Id: config2man,v 1.3 2003/12/09 18:33:52 ken3 Exp $ + # + # Copyright (c) 2001 Carnegie Mellon University. All rights reserved. +@@ -39,24 +40,6 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w +- +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + use strict; +diff -urNad cyrus-imapd-2.2.12/tools/dohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash +--- cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:44:39.023569458 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/perl -w + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +@@ -38,27 +38,10 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w + # script to upgrade from versions of imapd previous to 1.6.2 + # make sure you run it as the cyrus user + # $Id: dohash,v 1.11 2005/12/01 22:01:12 murch Exp $ + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + $| = 1; +diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec +--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:44:39.019569098 +0200 +@@ -1,4 +1,6 @@ +-#!/bin/sh ++#!/usr/bin/perl -w ++# ++# Script for mass compilation of sieve scripts. + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +@@ -38,28 +40,11 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w + # + # Script for mass compilation of sieve scripts. + # + # $Id: masssievec,v 1.5 2005/12/01 22:01:12 murch Exp $ + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + $| = 1; +diff -urNad cyrus-imapd-2.2.12/tools/mkimap /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap +--- cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:44:39.030570089 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/perl + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +@@ -38,25 +38,8 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w + # $Id: mkimap,v 1.17 2005/12/01 19:12:34 murch Exp $ + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + sub read_conf { +diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups +--- cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:44:39.022569368 +0200 +@@ -1,5 +1,8 @@ +-#!/bin/sh ++#!/usr/bin/perl -w + # ++# Create newsgroups on imap server ++# Based on the make_fromactive.pl script by Tim Martin ++# + # Copyright (c) 2003 Carnegie Mellon University. All rights reserved. + # + # Redistribution and use in source and binary forms, with or without +@@ -38,29 +41,6 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w +-# +-# Create newsgroups on imap server +-# Based on the make_fromactive.pl script by Tim Martin +-# +-# $Id: mknewsgroups,v 1.2 2003/10/22 18:03:47 rjs3 Exp $ +- +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + use Getopt::Long; +diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash +--- cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:44:39.029569999 +0200 +@@ -1,4 +1,8 @@ +-#!/bin/sh ++#!/usr/bin/perl ++# script to upgrade from simple hashing scheme to full hashing scheme ++# make sure you run it as the cyrus user ++# ++# Written by Gary Mills + # + # Copyright (c) 2000 Carnegie Mellon University. All rights reserved. + # +@@ -38,8 +42,6 @@ + # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w + # script to upgrade from simple hashing scheme to full hashing scheme + # make sure you run it as the cyrus user + # +@@ -47,21 +49,6 @@ + # + # $Id: rehash,v 1.8 2005/12/01 22:01:12 murch Exp $ + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + $| = 1; +diff -urNad cyrus-imapd-2.2.12/tools/translatesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve +--- cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:44:39.027569818 +0200 +@@ -1,6 +1,4 @@ +-#!/bin/sh +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w ++#!/usr/bin/perl + # script to translate sieve scripts to use unixhierarchysep and/or altnamespace + # make sure you run it as the cyrus user + #!/usr/bin/perl +@@ -45,21 +43,6 @@ + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + $| = 1; +diff -urNad cyrus-imapd-2.2.12/tools/undohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash +--- cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:44:39.028569908 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/perl -w + # script to downgrade from cyrus imapd 1.6.2+ to earlier. + # do NOT run this script while imapd's are running + # $Id: undohash,v 1.8 2005/12/01 22:01:13 murch Exp $ +diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve +--- cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:13:04.000000000 +0200 ++++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:44:39.021569278 +0200 +@@ -1,6 +1,4 @@ +-#!/bin/sh +-exec perl -x -S $0 ${1+"$@"} # -*-perl-*- +-#!perl -w ++#!/usr/bin/perl -w + # script to upgrade sievedir from imapd 1.6.13 + # make sure you run it as the cyrus user + #!/usr/bin/perl +@@ -45,21 +43,6 @@ + # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + # + +-if ($] !~ /^5\..*/) { +- # uh-oh. this isn't perl 5. +- foreach (split(/:/, $ENV{PATH})) { # try to find "perl5". +- exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5"); +- } +- # we failed. bail. +- die "Your perl is too old; I need perl 5.\n"; +-} +- +-# load the real script. this is isolated in an 'eval' so perl4 won't +-# choke on the perl5-isms. +-eval join("\n", ); +-if ($@) { die "$@"; } +- +-__END__ + require 5; + + $| = 1; --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/16-fix_mib.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/16-fix_mib.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 16-fix_mib.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix MIB file for cyrus + +@DPATCH@ +diff -urNad complete.dpatch/master/CYRUS-MASTER.mib /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib +--- complete.dpatch/master/CYRUS-MASTER.mib 2001-08-14 18:11:26.000000000 +0200 ++++ /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib 2005-11-10 17:11:15.237608454 +0100 +@@ -1,12 +1,15 @@ + CYRUS-MASTER-MIB DEFINITIONS ::= BEGIN + + IMPORTS +- MODULE-IDENTITY, OBJECT-TYPE, Counter32 ++ MODULE-IDENTITY, OBJECT-TYPE, Counter32, enterprises + FROM SNMPv2-SMI + DisplayString +- FROM SNMPv2-TC +- cmuCyrus +- FROM CMU-MIB; ++ FROM SNMPv2-TC; ++-- cmuCyrus ++-- FROM CMU-MIB; ++ ++cmuMIB OBJECT IDENTIFIER ::= { enterprises 3 } ++cmuCyrus OBJECT IDENTIFIER ::= { cmuMIB 6 } + + cyrusMasterMIB MODULE-IDENTITY + LAST-UPDATED "0010312300Z" -- 2000 Oct 31 --- cyrus-imapd-2.2-2.2.13.orig/debian/patches/65-sieveshell-enhancements.dpatch +++ cyrus-imapd-2.2-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch @@ -0,0 +1,258 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65-sieveshell-enhancements.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds some enhancements to sieveshell and fixes some paths. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm +--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:24:55.000000000 +0200 ++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:26:19.796548250 +0200 +@@ -126,7 +126,7 @@ + [\&_sc_info, '[mailbox]', + 'display mailbox/server metadata'], + mboxcfg => +- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value', ++ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/] value', + 'configure mailbox'], + mboxconfig => 'mboxcfg', + reconstruct => +@@ -437,7 +437,7 @@ + # programs, as opposed to things expected from within a program.) + sub shell { + my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) = +- ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl', ++ ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl', + "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef); + GetOptions('user|u=s' => \$auth, + 'authz|z=s' => \$authz, +@@ -467,7 +467,7 @@ + -rock => \$cyradm}); + $cyradm->authenticate(-authz => $authz, -user => $auth, + -mechanism => $mech, -password => $pw) +- or die "cyradm: cannot authenticate to server with $mech as $auth\n"; ++ or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n"; + } + my $fstk = [*STDIN, *STDOUT, *STDERR]; + if ($dorc && $systemrc ne '' && -f $systemrc) { +@@ -1400,7 +1400,7 @@ + while (defined ($opt = shift(@argv))) { + last if $opt eq '--'; + if ($opt =~ /^-/) { +- die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n"; + } + else { + push(@nargv, $opt); +@@ -1409,7 +1409,7 @@ + } + push(@nargv, @argv); + if (@nargv < 2) { +- die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n"; + } + if (!$cyrref || !$$cyrref) { + die "mboxconfig: no connection to server\n"; +diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c +--- cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:24:55.000000000 +0200 ++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:25:11.549208277 +0200 +@@ -560,7 +560,6 @@ + char **refer_to, char **errstrp) + { + int res; +- mystring_t *str=NULL; + mystring_t *errstr=NULL; + lexstate_t state; + int ret = 0; +diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl +--- cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:07.000000000 +0200 ++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:11.550208179 +0200 +@@ -60,7 +60,9 @@ + my $username = $ENV{USER}; + my $authname = $ENV{USER}; + my $realm = ""; ++my $password; + my $ex = ""; ++my $exfile = ""; + my $help = 0; + my $man = 0; + my $ret; +@@ -68,7 +70,9 @@ + GetOptions("a|authname:s" => \$authname, + "u|username:s" => \$username, + "r|realm:s" => \$realm, ++ "p|password:s" => \$password, + "e|exec:s" => \$ex, ++ "f|execfile:s" => \$exfile, + "help|?" => \$help, + man => \$man) or pod2usage(2); + pod2usage(1) if $help; +@@ -83,20 +87,24 @@ + my $filehandle; + my $interactive; + +-if (! $ex eq "") { +- $filehandle = tempfile(); +- +- if (!$filehandle) { die "unable to open tmp file: $?"; } +- +- print $filehandle $ex; +- seek $filehandle, 0, 0; # rewind file ++if (! $exfile eq "") { ++ open(FILEH,"<$exfile") || die "unable to open file: $?"; ++ $filehandle = *FILEH; + $interactive = 0; + } else { +- $filehandle = *STDIN; +- $interactive = 1; +-} ++ if (! $ex eq "") { ++ $filehandle = tempfile(); + ++ if (!$filehandle) { die "unable to open tmp file: $?"; } + ++ print $filehandle $ex; ++ seek $filehandle, 0, 0; # rewind file ++ $interactive = 0; ++ } else { ++ $filehandle = *STDIN; ++ $interactive = 1; ++ } ++} + + sub list_cb { + +@@ -121,6 +129,8 @@ + return $authname; + } elsif (($type eq "realm") && (defined $realm)) { + return $realm; ++ } elsif (($type eq "password") && (defined $password)) { ++ return $password; + } + + my $ostty; +@@ -171,6 +181,8 @@ + + my $term = Term::ReadLine->new("sieveshell"); + ++my $exitcode = 0; ++ + $term->ornaments(0); + + while(defined($_ = ($interactive ? $term->readline('> ') : <$filehandle>))){ +@@ -197,6 +209,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "upload failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "list") || + ($words[0] eq "l") || +@@ -206,6 +221,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "list failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "activate") || + ($words[0] eq "a")) { +@@ -218,6 +236,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "activate failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "deactivate") || + ($words[0] eq "da")) { +@@ -230,6 +251,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "deactivate failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "delete") || + ($words[0] eq "d")) { +@@ -242,6 +266,9 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "delete failed: $errstr\n"; ++ $exitcode = 1; ++ } else { ++ $exitcode = 0; + } + } elsif (($words[0] eq "get") || + ($words[0] eq "g")) { +@@ -255,25 +282,32 @@ + my $errstr = sieve_get_error($obj); + $errstr = "unknown error" if(!defined($errstr)); + print "get failed: $errstr\n"; ++ $exitcode = 1; + } else { + if ($words[2]) { + open (OUTPUT,">$words[2]") || die "Unable to open $words[2]"; + print OUTPUT $str; + close(OUTPUT); ++ $exitcode = 0; + } else { + print $str; ++ $exitcode = 0; + } + } + } elsif (($words[0] eq "quit") || ($words[0] eq "q")) { + sieve_logout($obj); +- exit 0; ++ exit $exitcode; + } elsif (($words[0] eq "help") || ($words[0] eq "?")) { + show_help(); ++ $exitcode = 0; + } else { + print "Invalid command: $words[0]\n"; ++ $exitcode = 1; + } + } + ++exit $exitcode; ++ + __END__ + + =head1 NAME +@@ -283,7 +317,8 @@ + =head1 SYNOPSIS + + sieveshell [B<--user>=I] [B<--authname>=I] +-[B<--realm>=I] [B<--exec>=I