--- cyrus-imapd-2.2-2.2.12.orig/debian/patches/19-fix_tls_ssl.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/11-fix_syslog_prefix.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/05-fix_programnames.dpatch +++ cyrus-imapd-2.2-2.2.12/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 +@@ -196,7 +196,7 @@ + + void usage(void) + { +- fprintf(stderr, "usage: quota [-C ] [-d ] [-f] [prefix]...\n"); ++ fprintf(stderr, "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.12.orig/debian/patches/15-munge_8bit.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/00-6662-upstream-off-by-one_in_imap_spool.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23-fix_off_by_one_in_imap_spool.dpatch by Benjamin Seidenberg +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: upstream patchset 6662: +## DP: imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/imap/spool.c /tmp/dpep.E9tYMt/cyrus-imapd-2.2.12/imap/spool.c +--- cyrus-imapd-2.2.12/imap/spool.c 2005-12-12 14:02:54.000000000 +0100 ++++ /tmp/dpep.E9tYMt/cyrus-imapd-2.2.12/imap/spool.c 2005-12-12 14:08:27.908074019 +0100 +@@ -451,7 +451,7 @@ + p[1] = '\n'; + p[2] = '\0'; + } +- else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-2)) { ++ else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-3)) { + /* line contained a \0 not at the end */ + r = IMAP_MESSAGE_CONTAINSNULL; + continue; --- cyrus-imapd-2.2-2.2.12.orig/debian/patches/60-lower-poptimeout-minimum.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/06-disable_runpath.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/08-clean_socket_closes.dpatch +++ cyrus-imapd-2.2-2.2.12/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 complete.dpatch/imap/backend.c /tmp/dpep.FbBq2t/complete.dpatch/imap/backend.c +--- complete.dpatch/imap/backend.c 2005-02-14 07:39:55.000000000 +0100 ++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/backend.c 2005-11-11 00:01:15.843304837 +0100 +@@ -382,6 +382,7 @@ + syslog(LOG_ERR, "couldn't authenticate to backend server: %s", + sasl_errstring(r, NULL, NULL)); + 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 +@@ -765,6 +765,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 +@@ -501,6 +501,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 +@@ -1443,6 +1443,9 @@ + #endif + + cyrus_done(); ++ cyrus_close_sock(0); ++ cyrus_close_sock(1); ++ cyrus_close_sock(2); + + exit(code); + } --- cyrus-imapd-2.2-2.2.12.orig/debian/patches/10-fix_potential_overflows.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/45-kolab2-annotations.dpatch +++ cyrus-imapd-2.2-2.2.12/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 cyrus22-imapd-2.2.12/imap/annotate.c /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c +--- cyrus22-imapd-2.2.12/imap/annotate.c 2005-03-12 23:09:22.000000000 +0100 ++++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c 2005-06-30 13:15:22.121300304 +0200 +@@ -1606,6 +1606,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, +@@ -1618,6 +1623,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)); +@@ -1639,37 +1645,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; +@@ -1679,7 +1703,7 @@ + goto cleanup; + } + value = annotate_canon_value(av->value, +- entries[entrycount].type); ++ working_entry->type); + if (!value) { + r = IMAP_ANNOTATION_BADVALUE; + goto cleanup; +@@ -1705,7 +1729,7 @@ + goto cleanup; + } + value = annotate_canon_value(av->value, +- entries[entrycount].type); ++ working_entry->type); + if (!value) { + r = IMAP_ANNOTATION_BADVALUE; + goto cleanup; +@@ -1807,6 +1831,12 @@ + /* Free the entry list */ + while (sdata.entry_list) { + struct annotate_st_entry_list *freeme = sdata.entry_list; ++ if (freeme != NULL){ ++ struct annotate_st_entry *freeme2 = freeme->entry; ++ if (freeme2 != NULL) { ++ free( freeme2 ); ++ } ++ } + sdata.entry_list = sdata.entry_list->next; + free(freeme); + } +diff -urNad cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm +--- cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2005-03-12 23:09:22.000000000 +0100 ++++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2005-06-30 13:16:29.270725801 +0200 +@@ -782,19 +782,21 @@ + my %values = ( "comment" => "/comment", + "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail", + "expire" => "/vendor/cmu/cyrus-imapd/expire", +- "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.12.orig/debian/patches/21-fix_config-parsing.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/35-masssievec_remove_unused_variable.dpatch +++ cyrus-imapd-2.2-2.2.12/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 +@@ -72,7 +72,6 @@ + open CONF, $imapdconf or die "can't open $imapdconf"; + while () { + 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.12.orig/debian/patches/99-update-autoconf.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/99-update-autoconf.dpatch @@ -0,0 +1,9778 @@ +#! /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: (drac and 64bit-quota) + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/config.h.in /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/config.h.in +--- cyrus-imapd-2.2.12/config.h.in 2005-11-11 19:21:57.000000000 +0100 ++++ /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/config.h.in 2005-11-11 20:46:36.707433160 +0100 +@@ -55,6 +55,9 @@ + /* What user will we run as? */ + #undef CYRUS_USER + ++/* Build DRAC support? */ ++#undef DRAC_AUTH ++ + /* Alternative to /dev/urandom? */ + #undef EGD_SOCKET + +@@ -147,8 +150,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 +@@ -298,6 +301,12 @@ + /* Directiory to use for service binaries */ + #undef SERVICE_PATH + ++/* The size of a `long long int', as computed by sizeof. */ ++#undef SIZEOF_LONG_LONG_INT ++ ++/* The size of a `unsigned long long int', as computed by sizeof. */ ++#undef SIZEOF_UNSIGNED_LONG_LONG_INT ++ + /* Do we already have setproctitle? */ + #undef SPT_TYPE + +@@ -322,6 +331,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 +@@ -336,9 +349,11 @@ + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const + +-/* Define as `__inline' if that's what the C compiler calls it, or to nothing +- if it is not supported. */ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus + #undef inline ++#endif + + + /* time.h */ +@@ -479,7 +494,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.12/configure /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/configure +--- cyrus-imapd-2.2.12/configure 2005-11-11 19:21:57.000000000 +0100 ++++ /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/configure 2005-11-11 20:46:36.953409030 +0100 +@@ -1,9 +1,8 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.57. ++# Generated by GNU Autoconf 2.59. + # +-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 2003 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -20,9 +19,10 @@ + elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix + fi ++DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. +-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset + else + as_unset=false +@@ -41,7 +41,7 @@ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME + do +- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ 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 +@@ -218,16 +218,17 @@ + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: + else ++ test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + + as_executable_p="test -f" + + # Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + + # Sed expression to map a string onto a valid variable name. +-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + # IFS +@@ -308,7 +309,7 @@ + # 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 WITH_AUTH 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 WITH_PTS 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 LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WARNERROR MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH 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 WITH_PTS 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 DRACLIBS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -667,7 +668,7 @@ + + # Be sure to have absolute paths. + for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +- localstatedir libdir includedir oldincludedir infodir mandir ++ localstatedir libdir includedir oldincludedir infodir mandir + do + eval ac_val=$`echo $ac_var` + case $ac_val in +@@ -707,10 +708,10 @@ + # Try the directory containing this script, then its parent. + ac_confdir=`(dirname "$0") 2>/dev/null || + $as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ +- X"$0" : 'X$//$[^/]' \| \ +- X"$0" : 'X$//$$' \| \ +- X"$0" : 'X$/$' \| \ +- . : '$.$' 2>/dev/null || ++ X"$0" : 'X$//$[^/]' \| \ ++ X"$0" : 'X$//$$' \| \ ++ X"$0" : 'X$/$' \| \ ++ . : '$.$' 2>/dev/null || + echo X"$0" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X$\/\/$[^/].*/{ s//\1/; q; } +@@ -802,9 +803,9 @@ + cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -843,6 +844,7 @@ + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-warnings-are-errors add -Werror to most gcc calls + --disable-sieve disable Sieve support + --enable-krb5afspts compile afskrb PTS module with krb5 support + --disable-server disable compiling servers +@@ -892,6 +894,7 @@ + --with-sasl=DIR Compile with libsasl2 in + --with-staticsasl=DIR Compile with staticly linked libsasl2 in + --with-perl=PERL use PERL for perl ++ --with-drac=DIR use DRAC library in no + --with-libwrap=DIR use libwrap (rooted in DIR) yes + --with-snmp=DIR use ucd|net snmp (rooted in DIR) yes + +@@ -940,12 +943,45 @@ + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac +-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +-# absolute. +-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ++ ++# Do not use `cd foo && pwd` to compute absolute paths, because ++# the directories may not exist. ++case `pwd` in ++.) ac_abs_builddir="$ac_dir";; ++*) ++ case "$ac_dir" in ++ .) ac_abs_builddir=`pwd`;; ++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ++ *) ac_abs_builddir=`pwd`/"$ac_dir";; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_builddir=${ac_top_builddir}.;; ++*) ++ case ${ac_top_builddir}. in ++ .) ac_abs_top_builddir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_srcdir=$ac_srcdir;; ++*) ++ case $ac_srcdir in ++ .) ac_abs_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_srcdir=$ac_top_srcdir;; ++*) ++ case $ac_top_srcdir in ++ .) ac_abs_top_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ++ esac;; ++esac + + cd $ac_dir + # Check for guested configure; otherwise get Cygnus style configure. +@@ -956,13 +992,13 @@ + echo + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || +- test -f $ac_srcdir/configure.in; then ++ test -f $ac_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -970,8 +1006,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + +-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +-Free Software Foundation, Inc. ++Copyright (C) 2003 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -983,7 +1018,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.57. Invocation command line was ++generated by GNU Autoconf 2.59. Invocation command line was + + $ $0 $@ + +@@ -1060,19 +1095,19 @@ + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. ++ ac_must_keep_next=false # Got value, back to normal. + else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. +@@ -1106,12 +1141,12 @@ + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ +- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +- s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='"'"'\\2'"'"'/p" ++ "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" ++ "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p" + ;; + esac; + } +@@ -1140,7 +1175,7 @@ + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi +@@ -1159,7 +1194,7 @@ + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 +- rm -f core core.* *.core && ++ rm -f core *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status + ' 0 +@@ -1239,7 +1274,7 @@ + # 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 ++ sed -n 's/^ac_env_$[a-zA-Z_0-9]*$_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" +@@ -1256,13 +1291,13 @@ + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: ++ ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. +@@ -1393,6 +1428,14 @@ + + + ++WARNERROR=-W ++# Check whether --enable-warnings-are-errors or --disable-warnings-are-errors was given. ++if test "${enable_warnings_are_errors+set}" = set; then ++ enableval="$enable_warnings_are_errors" ++ if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi ++fi; ++ ++ + + # Check whether --with-extraident or --without-extraident was given. + if test "${with_extraident+set}" = set; then +@@ -1853,7 +1896,6 @@ + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -1873,8 +1915,8 @@ + # 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" >&5 +-echo $ECHO_N "checking for C compiler default output... $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 +@@ -1894,23 +1936,23 @@ + 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. +- ;; ++ # This is the source file. ++ ;; + [ab].out ) +- # We found the default executable, but exeext='' is most +- # certainly right. +- break;; ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; + *.* ) +- ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` +- # FIXME: I believe we export ac_cv_exeext for Libtool, +- # but it would be cool to find out if it's true. Does anybody +- # maintain Libtool? --akim. +- export ac_cv_exeext +- break;; ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` ++ # FIXME: I believe we export ac_cv_exeext for Libtool, ++ # but it would be cool to find out if it's true. Does anybody ++ # maintain Libtool? --akim. ++ export ac_cv_exeext ++ break;; + * ) +- break;; ++ break;; + esac + done + else +@@ -1984,8 +2026,8 @@ + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` +- export ac_cv_exeext +- break;; ++ export ac_cv_exeext ++ break;; + * ) break;; + esac + done +@@ -2010,7 +2052,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2061,7 +2102,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2081,11 +2121,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -2098,7 +2147,7 @@ + + ac_compiler_gnu=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +@@ -2114,7 +2163,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2131,11 +2179,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -2148,7 +2205,7 @@ + + ac_cv_prog_cc_g=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +@@ -2175,7 +2232,6 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2203,6 +2259,16 @@ + va_end (v); + return s; + } ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std1 is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std1. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; +@@ -2229,11 +2295,20 @@ + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -2246,7 +2321,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext ++rm -f conftest.err conftest.$ac_objext + done + rm -f conftest.$ac_ext conftest.$ac_objext + CC=$ac_save_CC +@@ -2274,19 +2349,27 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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 \ +- ''\ +- '#include ' \ ++ '' \ + '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 ();' \ +@@ -2294,14 +2377,13 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include + $ac_declaration ++#include + int + main () + { +@@ -2312,11 +2394,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -2329,9 +2420,8 @@ + + continue + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2348,11 +2438,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -2364,7 +2463,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done + rm -f conftest* + if test -n "$ac_declaration"; then +@@ -2378,7 +2477,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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' +@@ -2467,7 +2566,7 @@ + + 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_,'` ++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2505,6 +2604,7 @@ + # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 + echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +@@ -2521,6 +2621,7 @@ + case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -2528,20 +2629,20 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then +- if test $ac_prog = install && +- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # AIX install. It has an incompatible calling convention. +- : +- elif test $ac_prog = install && +- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # program-specific install script used by HP pwplus--don't use. +- : +- else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi +- fi ++ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if test $ac_prog = install && ++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ : ++ elif test $ac_prog = install && ++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi + done + done + ;; +@@ -2600,7 +2701,6 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2611,7 +2711,7 @@ + #else + # include + #endif +- Syntax error ++ Syntax error + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -2623,6 +2723,7 @@ + (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 +@@ -2643,7 +2744,6 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2661,6 +2761,7 @@ + (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 +@@ -2707,7 +2808,6 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2718,7 +2818,7 @@ + #else + # include + #endif +- Syntax error ++ Syntax error + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -2730,6 +2830,7 @@ + (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 +@@ -2750,7 +2851,6 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2768,6 +2868,7 @@ + (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 +@@ -2826,7 +2927,6 @@ + echo "$as_me:$LINENO: checking for AIX" >&5 + echo $ECHO_N "checking for AIX... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2852,16 +2952,14 @@ + rm -f conftest* + + +- +- echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 +-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 +-if test "${ac_cv_lib_cposix_strerror+set}" = set; then ++echo "$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_check_lib_save_LIBS=$LIBS +-LIBS="-lcposix $LIBS" ++ ac_func_search_save_LIBS=$LIBS ++ac_cv_search_strerror=no + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2885,33 +2983,98 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_cposix_strerror=yes ++ ac_cv_search_strerror="none required" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_cposix_strerror=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++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 +-echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 +-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 +-if test $ac_cv_lib_cposix_strerror = yes; then +- LIBS="$LIBS -lcposix" ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ done + fi ++LIBS=$ac_func_search_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6 ++if test "$ac_cv_search_strerror" != no; then ++ test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" + +- ++fi + + for ac_prog in gawk mawk nawk awk + do +@@ -2959,7 +3122,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -3022,11 +3184,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -3039,7 +3210,7 @@ + + ac_cv_c_const=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 +@@ -3051,60 +3222,6 @@ + + fi + +-echo "$as_me:$LINENO: checking for long file names" >&5 +-echo $ECHO_N "checking for long file names... $ECHO_C" >&6 +-if test "${ac_cv_sys_long_file_names+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_sys_long_file_names=yes +-# Test for long file names in all the places we know might matter: +-# . the current directory, where building will happen +-# $prefix/lib where we will be installing things +-# $exec_prefix/lib likewise +-# eval it to expand exec_prefix. +-# $TMPDIR if set, where it might want to write temporary files +-# if $TMPDIR is not set: +-# /tmp where it might want to write temporary files +-# /var/tmp likewise +-# /usr/tmp likewise +-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then +- ac_tmpdirs=$TMPDIR +-else +- ac_tmpdirs='/tmp /var/tmp /usr/tmp' +-fi +-for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do +- test -d $ac_dir || continue +- test -w $ac_dir || continue # It is less confusing to not echo anything here. +- ac_xdir=$ac_dir/cf$$ +- (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue +- ac_tf1=$ac_xdir/conftest9012345 +- ac_tf2=$ac_xdir/conftest9012346 +- (echo 1 >$ac_tf1) 2>/dev/null +- (echo 2 >$ac_tf2) 2>/dev/null +- ac_val=`cat $ac_tf1 2>/dev/null` +- if test ! -f $ac_tf1 || test "$ac_val" != 1; then +- ac_cv_sys_long_file_names=no +- rm -rf $ac_xdir 2>/dev/null +- break +- fi +- rm -rf $ac_xdir 2>/dev/null +-done +-fi +-echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 +-echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 +-if test $ac_cv_sys_long_file_names = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LONG_FILE_NAMES 1 +-_ACEOF +- +-fi +- +-if test $ac_cv_sys_long_file_names = no; then +- { { echo "$as_me:$LINENO: error: The Cyrus IMAPD requires support for long file names" >&5 +-echo "$as_me: error: The Cyrus IMAPD requires support for long file names" >&2;} +- { (exit 1); exit 1; }; } +-fi + echo "$as_me:$LINENO: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then +@@ -3113,7 +3230,6 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -3128,11 +3244,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -3144,119 +3269,442 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done + + fi + echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 ++ ++ + case $ac_cv_c_inline in + inline | yes) ;; +- no) +-cat >>confdefs.h <<\_ACEOF +-#define inline +-_ACEOF +- ;; +- *) cat >>confdefs.h <<_ACEOF +-#define inline $ac_cv_c_inline ++ *) ++ case $ac_cv_c_inline in ++ no) ac_val=;; ++ *) ac_val=$ac_cv_c_inline;; ++ esac ++ cat >>confdefs.h <<_ACEOF ++#ifndef __cplusplus ++#define inline $ac_val ++#endif + _ACEOF +- ;; ++ ;; + esac + + +- +-echo "$as_me:$LINENO: checking for __attribute__" >&5 +-echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6 +-if test "${ac_cv___attribute__+set}" = set; then ++echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 ++if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- +-cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- + #include ++#include ++#include ++#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>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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 ++ ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv___attribute__=no ++ac_cv_header_stdc=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no + fi ++rm -f conftest* + +-if test "$ac_cv___attribute__" = "yes"; then ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ exit(2); ++ exit (0); ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no ++fi ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +-#define HAVE___ATTRIBUTE__ 1 ++#define STDC_HEADERS 1 + _ACEOF + + fi +-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5 +-echo "${ECHO_T}$ac_cv___attribute__" >&6 + ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +-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 ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + +-save_CFLAGS=$CFLAGS +-CFLAGS="${CFLAGS} -fPIC" +-cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_Header=no" ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++echo "$as_me:$LINENO: checking for long long int" >&5 ++echo $ECHO_N "checking for long long int... $ECHO_C" >&6 ++if test "${ac_cv_type_long_long_int+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((long long int *) 0) ++ return 0; ++if (sizeof (long long int)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_long_long_int=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-#include ++ac_cv_type_long_long_int=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6 + ++echo "$as_me:$LINENO: checking size of long long int" >&5 ++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6 ++if test "${ac_cv_sizeof_long_long_int+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$ac_cv_type_long_long_int" = yes; then ++ # The cast to unsigned long works around a bug in the HP C Compiler ++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++ # This bug is HP SR number 8606223364. ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + int + main () + { ++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)]; ++test_array [0] = 0 + +-static void +-foo(void) ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () + { +- exit(1); ++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; + } ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_lo=`expr $ac_mid + 1` ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ ac_mid=`expr 2 '*' $ac_mid + 1` ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)]; ++test_array [0] = 0 + + ; + return 0; +@@ -3264,148 +3712,509 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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 ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=$ac_mid; break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_fpic=no ++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.$ac_objext conftest.$ac_ext +-CFLAGS=$save_CFLAGS ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_lo= ac_hi= + fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; ++test_array [0] = 0 + +-if test "$ac_cv_fpic" = "yes"; then +- FPIC_CFLAGS="-fPIC" ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=$ac_mid + else +- FPIC_CFLAGS="" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_lo=`expr '(' $ac_mid ')' + 1` + fi +-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5 +-echo "${ECHO_T}$ac_cv_fpic" >&6 ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in ++?*) ac_cv_sizeof_long_long_int=$ac_lo;; ++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77 ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (long long int), 77 ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ;; ++esac ++else ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} ++ { (exit 1); exit 1; }; } ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++long longval () { return (long) (sizeof (long long int)); } ++unsigned long ulongval () { return (long) (sizeof (long long int)); } ++#include ++#include ++int ++main () ++{ + ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ exit (1); ++ if (((long) (sizeof (long long int))) < 0) ++ { ++ long i = longval (); ++ if (i != ((long) (sizeof (long long int)))) ++ exit (1); ++ fprintf (f, "%ld\n", i); ++ } ++ else ++ { ++ unsigned long i = ulongval (); ++ if (i != ((long) (sizeof (long long int)))) ++ exit (1); ++ fprintf (f, "%lu\n", i); ++ } ++ exit (ferror (f) || fclose (f) != 0); + ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sizeof_long_long_int=`cat conftest.val` ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- # 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 ++( exit $ac_status ) ++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77 ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (long long int), 77 ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++rm -f conftest.val ++else ++ ac_cv_sizeof_long_long_int=0 ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6 ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int ++_ACEOF ++ ++ ++echo "$as_me:$LINENO: checking for unsigned long long int" >&5 ++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6 ++if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((unsigned long long int *) 0) ++ return 0; ++if (sizeof (unsigned long long int)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_unsigned_long_long_int=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- # first, try -R +- SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-R /usr/lib" +- cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" ++ac_cv_type_unsigned_long_long_int=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6 ++ ++echo "$as_me:$LINENO: checking size of unsigned long long int" >&5 ++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6 ++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$ac_cv_type_unsigned_long_long_int" = yes; then ++ # The cast to unsigned long works around a bug in the HP C Compiler ++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++ # This bug is HP SR number 8606223364. ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) >= 0)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + int + main () + { ++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)]; ++test_array [0] = 0 + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++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 -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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 +- 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 ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- LDFLAGS="-Wl,-rpath,/usr/lib" +- cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" ++cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + int + main () + { ++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) >= $ac_mid)]; ++test_array [0] = 0 + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++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 -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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 +- 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.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_lo= ac_hi= + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="${SAVE_LDFLAGS}" +- ++rm -f 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 +- +-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 ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include +-#include +-#include +-#include +- ++$ac_includes_default + int + main () + { ++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)]; ++test_array [0] = 0 + + ; + return 0; +@@ -3413,103 +4222,313 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_stdc=yes ++ ac_hi=$ac_mid + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_header_stdc=no ++ac_lo=`expr '(' $ac_mid ')' + 1` + fi +-rm -f 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. ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in ++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;; ++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77 ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77 ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ;; ++esac ++else ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} ++ { (exit 1); exit 1; }; } ++else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++$ac_includes_default ++long longval () { return (long) (sizeof (unsigned long long int)); } ++unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); } ++#include ++#include ++int ++main () ++{ ++ ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ exit (1); ++ if (((long) (sizeof (unsigned long long int))) < 0) ++ { ++ long i = longval (); ++ if (i != ((long) (sizeof (unsigned long long int)))) ++ exit (1); ++ fprintf (f, "%ld\n", i); ++ } ++ else ++ { ++ unsigned long i = ulongval (); ++ if (i != ((long) (sizeof (unsigned long long int)))) ++ exit (1); ++ fprintf (f, "%lu\n", i); ++ } ++ exit (ferror (f) || fclose (f) != 0); + ++ ; ++ return 0; ++} + _ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val` + else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++( exit $ac_status ) ++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77 ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77 ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++rm -f conftest.val ++else ++ ac_cv_sizeof_unsigned_long_long_int=0 ++fi + fi ++echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5 ++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6 ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int ++_ACEOF + +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" ++ ++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \ ++ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LONG_LONG_INT ++_ACEOF ++ ++ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 ++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 ++if test "${ac_cv_c_bigendian+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # See if sys/param.h defines the BYTE_ORDER macro. ++cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include ++#include + ++int ++main () ++{ ++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN ++ bogus endian macros ++#endif ++ ++ ; ++ return 0; ++} + _ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ # It does; now see whether it defined to BIG_ENDIAN or not. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if BYTE_ORDER != BIG_ENDIAN ++ not big endian ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=yes + else +- ac_cv_header_stdc=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_c_bigendian=no + fi +-rm -f conftest* ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++# It does not; compile a test program. ++if test "$cross_compiling" = yes; then ++ # try to guess the endianness by grepping values into an object file ++ ac_cv_c_bigendian=unknown ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } ++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } ++int ++main () ++{ ++ _ascii (); _ebcdic (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ++ ac_cv_c_bigendian=yes + fi ++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then ++ if test "$ac_cv_c_bigendian" = unknown; then ++ ac_cv_c_bigendian=no ++ else ++ # finding both strings is unlikely to happen, but who knows? ++ ac_cv_c_bigendian=unknown ++ fi ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then +- : ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif +- +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int + main () + { +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ /* Are we little or big endian? From Harbison&Steele. */ ++ union ++ { ++ long l; ++ char c[sizeof (long)]; ++ } u; ++ u.l = 1; ++ exit (u.c[sizeof (long) - 1] == 1); + } + _ACEOF + rm -f conftest$ac_exeext +@@ -3523,90 +4542,191 @@ + 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_header_stdc=no ++ac_cv_c_bigendian=yes + fi +-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 +-if test $ac_cv_header_stdc = yes; then ++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 STDC_HEADERS 1 ++#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 + +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. + ++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 + +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++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 +- cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" ++ ++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. */ +-$ac_includes_default + +-#include <$ac_header> ++#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>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- eval "$as_ac_Header=yes" ++ ac_cv_fpic=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_Header=no" ++ac_cv_fpic=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++CFLAGS=$save_CFLAGS ++ + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF + ++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 + +-done ++ ++ ++ # CMU GUESS RUNPATH SWITCH ++ andrew_runpath_switch="none" + + + +@@ -3629,7 +4749,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -3640,11 +4759,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -3657,7 +4785,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -3665,7 +4793,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -3683,6 +4810,7 @@ + (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 +@@ -3702,33 +4830,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -3739,7 +4866,7 @@ + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- eval "$as_ac_Header=$ac_header_preproc" ++ 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 +@@ -3767,21 +4894,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -3812,11 +4946,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -3829,7 +4972,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -3839,7 +4983,14 @@ + _ACEOF + + else +- LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ++ case $LIBOBJS in ++ "$ac_func.$ac_objext" | \ ++ *" $ac_func.$ac_objext" | \ ++ "$ac_func.$ac_objext "* | \ ++ *" $ac_func.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; ++esac ++ + fi + done + +@@ -3855,21 +5006,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -3900,11 +5058,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -3917,7 +5084,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -3943,7 +5111,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -3963,11 +5130,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -3980,7 +5156,7 @@ + + eval "$as_ac_Header=no" + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +@@ -4003,7 +5179,6 @@ + ac_func_search_save_LIBS=$LIBS + ac_cv_search_opendir=no + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4027,11 +5202,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4043,12 +5227,12 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4072,11 +5256,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4089,7 +5282,8 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + done + fi + LIBS=$ac_func_search_save_LIBS +@@ -4110,7 +5304,6 @@ + ac_func_search_save_LIBS=$LIBS + ac_cv_search_opendir=no + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4134,11 +5327,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4150,12 +5352,12 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4179,11 +5381,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4196,7 +5407,8 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + done + fi + LIBS=$ac_func_search_save_LIBS +@@ -4220,21 +5432,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define connect to an innocuous variant, in case declares connect. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define connect innocuous_connect ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef connect ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -4265,11 +5484,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4282,7 +5510,8 @@ + + ac_cv_func_connect=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 + echo "${ECHO_T}$ac_cv_func_connect" >&6 +@@ -4297,7 +5526,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4321,11 +5549,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4338,7 +5575,8 @@ + + ac_cv_lib_nsl_gethostbyname=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +@@ -4355,7 +5593,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4379,11 +5616,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4396,7 +5642,8 @@ + + ac_cv_lib_socket_connect=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +@@ -4415,21 +5662,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define res_search to an innocuous variant, in case declares res_search. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define res_search innocuous_res_search ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char res_search (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef res_search ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -4460,11 +5714,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4477,7 +5740,8 @@ + + ac_cv_func_res_search=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5 + echo "${ECHO_T}$ac_cv_func_res_search" >&6 +@@ -4492,7 +5756,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4516,11 +5779,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4533,7 +5805,8 @@ + + ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +@@ -4557,21 +5830,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -4602,11 +5882,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4619,7 +5908,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -4644,21 +5934,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define getaddrinfo to an innocuous variant, in case declares getaddrinfo. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define getaddrinfo innocuous_getaddrinfo ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getaddrinfo (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef getaddrinfo ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -4689,11 +5986,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4706,7 +6012,8 @@ + + ac_cv_func_getaddrinfo=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 + echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 +@@ -4723,7 +6030,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4747,11 +6053,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4764,7 +6079,8 @@ + + ac_cv_lib_socket_getaddrinfo=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5 +@@ -4803,7 +6119,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-linet6 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4827,11 +6142,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4844,7 +6168,8 @@ + + ac_cv_lib_inet6_getaddrinfo=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5 +@@ -4872,7 +6197,6 @@ + if test getaddrinfo = getaddrinfo; then + for ipv6_cv_pfx in o n; do + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4890,21 +6214,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define ${ipv6_cv_pfx}getaddrinfo to an innocuous variant, in case declares ${ipv6_cv_pfx}getaddrinfo. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define ${ipv6_cv_pfx}getaddrinfo innocuous_${ipv6_cv_pfx}getaddrinfo ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ${ipv6_cv_pfx}getaddrinfo (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef ${ipv6_cv_pfx}getaddrinfo ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -4935,11 +6266,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -4952,7 +6292,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -4980,21 +6321,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define gai_strerror to an innocuous variant, in case declares gai_strerror. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define gai_strerror innocuous_gai_strerror ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gai_strerror (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef gai_strerror ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -5025,11 +6373,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5042,7 +6399,8 @@ + + ac_cv_func_gai_strerror=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5 + echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6 +@@ -5059,7 +6417,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5083,11 +6440,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5100,7 +6466,8 @@ + + ac_cv_lib_socket_gai_strerror=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5 +@@ -5139,7 +6506,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-linet6 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5163,11 +6529,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5180,7 +6555,8 @@ + + ac_cv_lib_inet6_gai_strerror=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5 +@@ -5208,7 +6584,6 @@ + if test gai_strerror = getaddrinfo; then + for ipv6_cv_pfx in o n; do + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5226,21 +6601,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define ${ipv6_cv_pfx}gai_strerror to an innocuous variant, in case declares ${ipv6_cv_pfx}gai_strerror. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define ${ipv6_cv_pfx}gai_strerror innocuous_${ipv6_cv_pfx}gai_strerror ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ${ipv6_cv_pfx}gai_strerror (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef ${ipv6_cv_pfx}gai_strerror ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -5271,11 +6653,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5288,7 +6679,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -5333,21 +6725,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define getnameinfo to an innocuous variant, in case declares getnameinfo. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define getnameinfo innocuous_getnameinfo ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getnameinfo (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef getnameinfo ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -5378,11 +6777,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5395,7 +6803,8 @@ + + ac_cv_func_getnameinfo=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5 + echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6 +@@ -5412,7 +6821,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5436,11 +6844,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5453,7 +6870,8 @@ + + ac_cv_lib_socket_getnameinfo=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5 +@@ -5492,7 +6910,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-linet6 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5516,11 +6933,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5533,7 +6959,8 @@ + + ac_cv_lib_inet6_getnameinfo=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5 +@@ -5561,7 +6988,6 @@ + if test getnameinfo = getaddrinfo; then + for ipv6_cv_pfx in o n; do + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5579,21 +7005,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define ${ipv6_cv_pfx}getnameinfo to an innocuous variant, in case declares ${ipv6_cv_pfx}getnameinfo. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define ${ipv6_cv_pfx}getnameinfo innocuous_${ipv6_cv_pfx}getnameinfo ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ${ipv6_cv_pfx}getnameinfo (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef ${ipv6_cv_pfx}getnameinfo ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -5624,11 +7057,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5641,7 +7083,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -5682,7 +7125,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5700,11 +7142,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5717,7 +7168,7 @@ + + ipv6_cv_ss_family=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ipv6_cv_ss_family = yes; then + +@@ -5737,7 +7188,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5755,11 +7205,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5772,7 +7231,7 @@ + + ipv6_cv_sa_len=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ipv6_cv_sa_len = yes; then + +@@ -5805,7 +7264,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5816,11 +7274,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5833,7 +7300,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -5841,7 +7308,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5859,6 +7325,7 @@ + (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 +@@ -5878,33 +7345,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -5915,7 +7381,7 @@ + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- eval "$as_ac_Header=$ac_header_preproc" ++ 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 +@@ -5936,7 +7402,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -5957,11 +7422,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -5974,7 +7448,7 @@ + + ac_cv_header_time=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 +@@ -5992,7 +7466,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6011,11 +7484,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6028,7 +7510,7 @@ + + ac_cv_struct_tm=sys/time.h + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 + echo "${ECHO_T}$ac_cv_struct_tm" >&6 +@@ -6046,7 +7528,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6068,11 +7549,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6084,7 +7574,6 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6106,11 +7595,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6123,9 +7621,9 @@ + + ac_cv_member_struct_tm_tm_zone=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 + echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6 +@@ -6151,7 +7649,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6172,11 +7669,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6189,7 +7695,8 @@ + + ac_cv_var_tzname=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 + echo "${ECHO_T}$ac_cv_var_tzname" >&6 +@@ -6218,21 +7725,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -6263,11 +7777,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6280,7 +7803,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -6295,21 +7819,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define _doprnt to an innocuous variant, in case declares _doprnt. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define _doprnt innocuous__doprnt ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char _doprnt (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef _doprnt ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -6340,11 +7871,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6357,7 +7897,8 @@ + + ac_cv_func__doprnt=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 + echo "${ECHO_T}$ac_cv_func__doprnt" >&6 +@@ -6470,7 +8011,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6481,11 +8021,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6498,7 +8047,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -6506,7 +8055,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6524,6 +8072,7 @@ + (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 +@@ -6543,33 +8092,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: db.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: db.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: db.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: db.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: db.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: db.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: db.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: db.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: db.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: db.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: db.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -6616,7 +8164,6 @@ + do + LIBS="$saved_LIBS -l$dbname" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6633,11 +8180,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6650,13 +8206,13 @@ + + dblib="no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test "$dblib" = "berkeley"; then break; fi + done + if test "$dblib" = "no"; then + LIBS="$saved_LIBS -ldb" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6673,11 +8229,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6690,7 +8255,8 @@ + + dblib="no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + LIBS=$saved_LIBS + +@@ -6858,7 +8424,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lfl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6882,11 +8447,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6899,7 +8473,8 @@ + + ac_cv_lib_fl_yywrap=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++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 +@@ -6915,7 +8490,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ll $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -6939,11 +8513,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -6956,7 +8539,8 @@ + + ac_cv_lib_l_yywrap=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++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 +@@ -7018,11 +8602,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7034,7 +8627,8 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_save_LIBS + rm -f "${LEX_OUTPUT_ROOT}.c" + +@@ -7059,7 +8653,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lfl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7077,11 +8670,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7094,7 +8696,8 @@ + + ac_cv_lib_fl_main=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5 +@@ -7117,7 +8720,6 @@ + ac_func_search_save_LIBS=$LIBS + ac_cv_search_regcomp=no + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7141,11 +8743,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7157,12 +8768,12 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7186,11 +8797,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7203,7 +8823,8 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + done + fi + LIBS=$ac_func_search_save_LIBS +@@ -7231,7 +8852,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7242,11 +8862,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7259,7 +8888,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -7267,7 +8896,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7285,6 +8913,7 @@ + (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 +@@ -7304,33 +8933,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: rxposix.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: rxposix.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: rxposix.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: rxposix.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: rxposix.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: rxposix.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: rxposix.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: rxposix.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: rxposix.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: rxposix.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: rxposix.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -7372,21 +9000,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define strerror to an innocuous variant, in case declares strerror. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define strerror innocuous_strerror ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strerror (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef strerror ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -7417,11 +9052,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7434,7 +9078,8 @@ + + ac_cv_func_strerror=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5 + echo "${ECHO_T}$ac_cv_func_strerror" >&6 +@@ -7470,7 +9115,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7481,11 +9125,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7498,7 +9151,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -7506,7 +9159,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7524,6 +9176,7 @@ + (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 +@@ -7543,33 +9196,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -7580,7 +9232,7 @@ + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- eval "$as_ac_Header=$ac_header_preproc" ++ 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 +@@ -7605,21 +9257,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -7650,11 +9309,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7667,7 +9335,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -7689,21 +9358,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -7734,11 +9410,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7751,7 +9436,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -7775,21 +9461,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -7820,11 +9513,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7837,7 +9539,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -7860,21 +9563,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -7905,11 +9615,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -7922,7 +9641,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -7936,7 +9656,6 @@ + + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7956,7 +9675,6 @@ + rm -f conftest* + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -7976,7 +9694,6 @@ + rm -f conftest* + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8003,21 +9720,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define setproctitle to an innocuous variant, in case declares setproctitle. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define setproctitle innocuous_setproctitle ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char setproctitle (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef setproctitle ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -8048,11 +9772,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8065,7 +9798,8 @@ + + ac_cv_func_setproctitle=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5 + echo "${ECHO_T}$ac_cv_func_setproctitle" >&6 +@@ -8082,7 +9816,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8106,11 +9839,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8123,7 +9865,8 @@ + + ac_cv_lib_util_setproctitle=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5 +@@ -8148,7 +9891,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8159,11 +9901,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8176,7 +9927,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -8184,7 +9935,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8202,6 +9952,7 @@ + (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 +@@ -8221,33 +9972,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/pstat.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sys/pstat.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: sys/pstat.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/pstat.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sys/pstat.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/pstat.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/pstat.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/pstat.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/pstat.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/pstat.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/pstat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -8284,7 +10034,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8295,11 +10044,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8312,7 +10070,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -8320,7 +10078,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8338,6 +10095,7 @@ + (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 +@@ -8357,33 +10115,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: sys/sysnews.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sys/sysnews.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/sysnews.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/sysnews.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/sysnews.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -8413,7 +10170,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8436,6 +10192,7 @@ + (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 +@@ -8466,7 +10223,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8487,6 +10243,7 @@ + (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 +@@ -8517,7 +10274,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8538,6 +10294,7 @@ + (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 +@@ -8575,7 +10332,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8597,11 +10353,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8614,7 +10379,8 @@ + + cyrus_cv_sys_nonblock=ioctl + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + WITH_NONBLOCK=$cyrus_cv_sys_nonblock +@@ -8628,7 +10394,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8648,11 +10413,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8665,7 +10439,7 @@ + + cyrus_cv_struct_sys_gmtoff=gmtime + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff +@@ -8681,7 +10455,6 @@ + cyrus_cv_func_mmap_shared=no + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8733,7 +10506,7 @@ + ( exit $ac_status ) + cyrus_cv_func_mmap_shared=no + fi +-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi + +@@ -8751,7 +10524,6 @@ + cyrus_cv_func_mmap_stupidshared=no + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8804,7 +10576,7 @@ + ( exit $ac_status ) + cyrus_cv_func_mmap_stupidshared=no + fi +-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi + +@@ -8835,21 +10607,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define fcntl to an innocuous variant, in case declares fcntl. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define fcntl innocuous_fcntl ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char fcntl (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef fcntl ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -8880,11 +10659,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8897,7 +10685,8 @@ + + ac_cv_func_fcntl=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5 + echo "${ECHO_T}$ac_cv_func_fcntl" >&6 +@@ -8911,21 +10700,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define flock to an innocuous variant, in case declares flock. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define flock innocuous_flock ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char flock (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef flock ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -8956,11 +10752,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -8973,7 +10778,8 @@ + + ac_cv_func_flock=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5 + echo "${ECHO_T}$ac_cv_func_flock" >&6 +@@ -9002,21 +10808,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define fdatasync to an innocuous variant, in case declares fdatasync. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define fdatasync innocuous_fdatasync ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char fdatasync (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef fdatasync ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -9047,11 +10860,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9064,7 +10886,8 @@ + + ac_cv_func_fdatasync=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5 + echo "${ECHO_T}$ac_cv_func_fdatasync" >&6 +@@ -9084,7 +10907,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9108,11 +10930,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9125,7 +10956,8 @@ + + ac_cv_lib_rt_fdatasync=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5 +@@ -9156,21 +10988,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define sigvec to an innocuous variant, in case declares sigvec. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define sigvec innocuous_sigvec ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char sigvec (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef sigvec ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -9201,11 +11040,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9218,7 +11066,8 @@ + + ac_cv_func_sigvec=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5 + echo "${ECHO_T}$ac_cv_func_sigvec" >&6 +@@ -9236,7 +11085,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lBSD $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9260,11 +11108,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9277,7 +11134,8 @@ + + ac_cv_lib_BSD_sigvec=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5 +@@ -9296,7 +11154,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lucb $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9320,11 +11177,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9337,7 +11203,8 @@ + + ac_cv_lib_ucb_sigvec=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5 +@@ -9444,7 +11311,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9461,11 +11327,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9486,7 +11361,8 @@ + cyrus_afs_sigvec="yes" + + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi + +@@ -9530,7 +11406,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lldap -llber $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9554,11 +11429,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9571,7 +11455,8 @@ + + ac_cv_lib_ldap_ldap_initialize=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 +@@ -9651,7 +11536,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9675,11 +11559,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9692,7 +11585,8 @@ + + ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +@@ -9730,7 +11624,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldes $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9754,11 +11647,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9771,7 +11673,8 @@ + + ac_cv_lib_des_des_ecb_encrypt=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5 +@@ -9842,7 +11745,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9853,11 +11755,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -9870,7 +11781,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -9878,7 +11789,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9896,6 +11806,7 @@ + (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 +@@ -9915,33 +11826,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: krb.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: krb.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: krb.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: krb.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: krb.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: krb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -9968,7 +11878,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l${KRBLIB} $KRB_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -9992,11 +11901,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10009,7 +11927,8 @@ + + eval "$as_ac_Lib=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +@@ -10080,7 +11999,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrsaref $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10104,11 +12022,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10121,7 +12048,8 @@ + + ac_cv_lib_rsaref_RSAPublicEncrypt=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5 +@@ -10142,7 +12070,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcrypto $LIB_RSAREF $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10166,11 +12093,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10183,7 +12119,8 @@ + + ac_cv_lib_crypto_BIO_accept=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5 +@@ -10202,7 +12139,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10226,11 +12162,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10243,7 +12188,8 @@ + + ac_cv_lib_ssl_SSL_CTX_new=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 +@@ -10335,7 +12281,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lzephyr $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10359,11 +12304,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10376,7 +12330,8 @@ + + ac_cv_lib_zephyr_ZInitialize=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5 +@@ -10468,7 +12423,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcom_err $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10492,11 +12446,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10509,7 +12472,8 @@ + + ac_cv_lib_com_err_com_err=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 +@@ -10533,7 +12497,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10544,11 +12507,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10561,7 +12533,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -10569,7 +12541,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10587,6 +12558,7 @@ + (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 +@@ -10606,33 +12578,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: et/com_err.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: et/com_err.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: et/com_err.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: et/com_err.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: et/com_err.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: et/com_err.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: et/com_err.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: et/com_err.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: et/com_err.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: et/com_err.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: et/com_err.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -10669,7 +12640,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10680,11 +12650,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -10697,7 +12676,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -10705,7 +12684,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -10723,6 +12701,7 @@ + (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 +@@ -10742,33 +12721,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: com_err.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: com_err.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: com_err.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: com_err.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: com_err.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: com_err.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: com_err.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: com_err.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: com_err.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -10984,7 +12962,6 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11005,6 +12982,7 @@ + (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 +@@ -11060,21 +13038,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -11105,11 +13090,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11122,7 +13116,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -11132,7 +13127,14 @@ + _ACEOF + + else +- LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ++ case $LIBOBJS in ++ "$ac_func.$ac_objext" | \ ++ *" $ac_func.$ac_objext" | \ ++ "$ac_func.$ac_objext "* | \ ++ *" $ac_func.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; ++esac ++ + fi + done + +@@ -11198,21 +13200,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define dlopen to an innocuous variant, in case declares dlopen. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define dlopen innocuous_dlopen ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef dlopen ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -11243,11 +13252,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11260,7 +13278,8 @@ + + ac_cv_func_dlopen=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 + echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +@@ -11276,7 +13295,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11300,11 +13318,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11317,7 +13344,8 @@ + + ac_cv_lib_dl_dlopen=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +@@ -11340,21 +13368,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define crypt to an innocuous variant, in case declares crypt. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define crypt innocuous_crypt ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char crypt (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef crypt ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -11385,11 +13420,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11402,7 +13446,8 @@ + + ac_cv_func_crypt=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5 + echo "${ECHO_T}$ac_cv_func_crypt" >&6 +@@ -11418,7 +13463,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcrypt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11442,11 +13486,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11459,7 +13512,8 @@ + + ac_cv_lib_crypt_crypt=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +@@ -11510,6 +13564,7 @@ + platform=__solaris + ;; + *-*-aix*) ++###_AIX + platform=__aix + ;; + *) +@@ -11529,6 +13584,8 @@ + CPPFLAGS="$CPPFLAGS -I$gssapi/include" + # We want to keep -I in our CPPFLAGS, but only if we succeed + cmu_saved_CPPFLAGS=$CPPFLAGS ++### I am not sure how useful is this (and whether this is required at all ++### especially when we have to provide two -L flags for new CyberSafe + LDFLAGS="$LDFLAGS -L$gssapi/lib" + + if test -n "$platform"; then +@@ -11553,7 +13610,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11564,11 +13620,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11581,7 +13646,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -11589,7 +13654,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11607,6 +13671,7 @@ + (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 +@@ -11626,33 +13691,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: gssapi.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: gssapi.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: gssapi.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: gssapi.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -11690,7 +13754,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11701,11 +13764,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11718,7 +13790,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -11726,7 +13798,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11744,6 +13815,7 @@ + (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 +@@ -11763,33 +13835,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: gssapi/gssapi.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: gssapi/gssapi.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: gssapi/gssapi.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -11833,7 +13904,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11857,11 +13927,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11874,7 +13953,8 @@ + + ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +@@ -11911,7 +13991,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -11935,11 +14014,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -11952,7 +14040,8 @@ + + ac_cv_lib_gssapi_gss_unwrap=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5 +@@ -11978,7 +14067,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgssapi_krb5 $GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET} $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12002,11 +14090,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12019,7 +14116,8 @@ + + ac_cv_lib_gssapi_krb5_gss_unwrap=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5 +@@ -12063,7 +14161,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgss $GSSAPIBASE_LIBS -lgss -lcstbk5 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12087,11 +14184,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12104,7 +14210,8 @@ + + ac_cv_lib_gss_csf_gss_acq_user=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5 +@@ -12121,7 +14228,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12145,11 +14251,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12162,7 +14277,8 @@ + + ac_cv_lib_gss_csf_gss_acq_user=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5 +@@ -12197,7 +14313,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgss -lgss $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12221,11 +14336,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12238,7 +14362,8 @@ + + ac_cv_lib_gss_gss_unwrap=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5 +@@ -12297,7 +14422,6 @@ + if test "$gssapi" != "no"; then + if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12325,7 +14449,6 @@ + + elif test "$ac_cv_header_gssapi_h" = "yes"; then + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12347,7 +14470,6 @@ + elif test "$ac_cv_header_gssapi_gssapi_h"; then + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12370,7 +14492,6 @@ + + if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12397,7 +14518,6 @@ + + elif test "$ac_cv_header_gssapi_h" = "yes"; then + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12418,7 +14538,6 @@ + + elif test "$ac_cv_header_gssapi_gssapi_h"; then + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12454,7 +14573,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12478,11 +14596,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12495,7 +14622,8 @@ + + ac_cv_lib_resolv_res_search=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 +@@ -12519,21 +14647,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef $ac_func ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -12564,11 +14699,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12581,7 +14725,8 @@ + + eval "$as_ac_var=no" + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +@@ -12663,7 +14808,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12674,11 +14818,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12691,7 +14844,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -12699,7 +14852,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12717,6 +14869,7 @@ + (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 +@@ -12736,33 +14889,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -12794,7 +14946,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12805,11 +14956,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -12822,7 +14982,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -12830,7 +14990,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12848,6 +15007,7 @@ + (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 +@@ -12867,33 +15027,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -12979,7 +15138,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -12990,11 +15148,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13007,7 +15174,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -13015,7 +15182,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13033,6 +15199,7 @@ + (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 +@@ -13052,33 +15219,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -13110,7 +15276,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13121,11 +15286,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13138,7 +15312,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -13146,7 +15320,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13164,6 +15337,7 @@ + (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 +@@ -13183,33 +15357,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -13236,7 +15409,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsasl2 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13260,11 +15432,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13277,7 +15458,8 @@ + + ac_cv_lib_sasl2_prop_get=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5 +@@ -13350,7 +15532,6 @@ + CPPFLAGS="$CPPFLAGS $SASLFLAGS" + + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13384,6 +15565,7 @@ + (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 +@@ -13419,7 +15601,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsasl2 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13443,11 +15624,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13460,7 +15650,8 @@ + + ac_cv_lib_sasl2_sasl_checkapop=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5 +@@ -13570,21 +15761,28 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++/* Define MD5Init to an innocuous variant, in case declares MD5Init. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define MD5Init innocuous_MD5Init ++ + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char MD5Init (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ ++ + #ifdef __STDC__ + # include + #else + # include + #endif ++ ++#undef MD5Init ++ + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" +@@ -13615,11 +15813,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13632,7 +15839,8 @@ + + ac_cv_func_MD5Init=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5 + echo "${ECHO_T}$ac_cv_func_MD5Init" >&6 +@@ -13647,7 +15855,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13671,11 +15878,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13688,7 +15904,8 @@ + + ac_cv_lib_md_MD5Init=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5 +@@ -13706,6 +15923,89 @@ + SNMP_SUBDIRS="" + + ++DRACLIBS= ++ ++# Check whether --with-drac or --without-drac was given. ++if test "${with_drac+set}" = set; then ++ withval="$with_drac" ++ if test -d "$withval"; then ++ LDFLAGS="$LDFLAGS -L${withval}" ++ echo "$as_me:$LINENO: checking for dracauth in -ldrac" >&5 ++echo $ECHO_N "checking for dracauth in -ldrac... $ECHO_C" >&6 ++if test "${ac_cv_lib_drac_dracauth+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldrac $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 dracauth (); ++int ++main () ++{ ++dracauth (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_drac_dracauth=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_drac_dracauth=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_drac_dracauth" >&5 ++echo "${ECHO_T}$ac_cv_lib_drac_dracauth" >&6 ++if test $ac_cv_lib_drac_dracauth = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define DRAC_AUTH ++_ACEOF ++ ++ DRACLIBS="-ldrac" ++fi ++ ++ fi ++fi; ++ ++ + + + +@@ -13730,7 +16030,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lwrap ${LIB_SOCKET} $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13754,11 +16053,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13771,7 +16079,8 @@ + + ac_cv_lib_wrap_request_init=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5 +@@ -13791,7 +16100,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13802,11 +16110,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13819,7 +16136,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -13827,7 +16144,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13845,6 +16161,7 @@ + (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 +@@ -13864,33 +16181,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: tcpd.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: tcpd.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tcpd.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tcpd.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tcpd.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tcpd.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -13940,7 +16256,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -13964,11 +16279,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -13981,7 +16305,8 @@ + + ac_cv_lib_nsl_yp_get_default_domain=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 +@@ -14097,7 +16422,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsnmp ${LIB_SOCKET} $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -14121,11 +16445,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -14138,7 +16471,8 @@ + + ac_cv_lib_snmp_sprint_objid=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5 +@@ -14158,7 +16492,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -14169,11 +16502,20 @@ + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -14186,7 +16528,7 @@ + + ac_header_compiler=no + fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++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 + +@@ -14194,7 +16536,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 +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -14212,6 +16553,7 @@ + (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 +@@ -14231,33 +16573,32 @@ + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) + { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; +- no:yes ) ++ no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: ucd-snmp/version.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: ucd-snmp/version.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: ucd-snmp/version.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## ++## ------------------------------------------ ## ++## Report this to the AC_PACKAGE_NAME lists. ## ++## ------------------------------------------ ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 +@@ -14307,7 +16648,6 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrpm -lpopt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -14331,11 +16671,20 @@ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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=$? +@@ -14348,7 +16697,8 @@ + + ac_cv_lib_rpm_rpmdbOpen=no + fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5 +@@ -14440,13 +16790,13 @@ + # `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" ++ "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" ++ "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p" + ;; + esac; + } | +@@ -14476,13 +16826,13 @@ + # 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[ ]*=/{ ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ + s/:*\$(srcdir):*/:/; + s/:*\${srcdir}:*/:/; + s/:*@srcdir@:*/:/; +-s/^$[^=]*=[ ]*$:*/\1/; ++s/^$[^=]*=[ ]*$:*/\1/; + s/:*$//; +-s/^[^=]*=[ ]*$//; ++s/^[^=]*=[ ]*$//; + }' + fi + +@@ -14493,7 +16843,7 @@ + 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$//'` ++ 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' +@@ -14537,9 +16887,10 @@ + elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix + fi ++DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. +-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset + else + as_unset=false +@@ -14558,7 +16909,7 @@ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME + do +- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ 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 +@@ -14737,16 +17088,17 @@ + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: + else ++ test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + + as_executable_p="test -f" + + # Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + + # Sed expression to map a string onto a valid variable name. +-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + # IFS +@@ -14773,7 +17125,7 @@ + cat >&5 <<_CSEOF + + This file was extended by $as_me, which was +-generated by GNU Autoconf 2.57. Invocation command line was ++generated by GNU Autoconf 2.59. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -14817,9 +17169,9 @@ + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE ++ instantiate the configuration file FILE + --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -14833,11 +17185,10 @@ + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.57, ++configured by $0, generated by GNU Autoconf 2.59, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 2003 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + srcdir=$srcdir +@@ -15038,6 +17389,7 @@ + s,@host_cpu@,$host_cpu,;t t + s,@host_vendor@,$host_vendor,;t t + s,@host_os@,$host_os,;t t ++s,@WARNERROR@,$WARNERROR,;t t + s,@MAKEDEPEND@,$MAKEDEPEND,;t t + s,@cyrus_prefix@,$cyrus_prefix,;t t + s,@service_path@,$service_path,;t t +@@ -15111,6 +17463,7 @@ + s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t + s,@MD5OBJ@,$MD5OBJ,;t t + s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t ++s,@DRACLIBS@,$DRACLIBS,;t t + s,@LIB_WRAP@,$LIB_WRAP,;t t + s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t + s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t +@@ -15149,9 +17502,9 @@ + (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" ++ 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" ++ 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 +@@ -15169,21 +17522,21 @@ + # 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,:.*,,'` ;; ++ 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=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || + $as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X$//$[^/]' \| \ +- X"$ac_file" : 'X$//$$' \| \ +- X"$ac_file" : 'X$/$' \| \ +- . : '$.$' 2>/dev/null || ++ 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; } +@@ -15199,10 +17552,10 @@ + 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 || ++ 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; } +@@ -15240,12 +17593,45 @@ + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac +-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +-# absolute. +-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ++ ++# Do not use `cd foo && pwd` to compute absolute paths, because ++# the directories may not exist. ++case `pwd` in ++.) ac_abs_builddir="$ac_dir";; ++*) ++ case "$ac_dir" in ++ .) ac_abs_builddir=`pwd`;; ++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ++ *) ac_abs_builddir=`pwd`/"$ac_dir";; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_builddir=${ac_top_builddir}.;; ++*) ++ case ${ac_top_builddir}. in ++ .) ac_abs_top_builddir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_srcdir=$ac_srcdir;; ++*) ++ case $ac_srcdir in ++ .) ac_abs_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_srcdir=$ac_top_srcdir;; ++*) ++ case $ac_top_srcdir in ++ .) ac_abs_top_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ++ esac;; ++esac + + + case $INSTALL in +@@ -15253,11 +17639,6 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -15267,7 +17648,7 @@ + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | +- sed 's,.*/,,'` by configure." ++ sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. +@@ -15276,26 +17657,32 @@ + 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 ++ # 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;; ++ 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 ++ 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;; ++ fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +@@ -15335,12 +17722,12 @@ + # 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_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_uA='s,^$[ ]*$#$[ ]*$undef$[ ][ ]*$' + ac_uB='$,\1#\2define\3' + ac_uC=' ' + ac_uD=',;t' +@@ -15349,11 +17736,11 @@ + # 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,:.*,,'` ;; ++ 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=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + +@@ -15367,28 +17754,29 @@ + 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 ++ # 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;; ++ # 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 ++ 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;; ++ fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. +- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in ++ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + + _ACEOF + +@@ -15411,9 +17799,9 @@ + s,[\\$`],\\&,g + t clear + : clear +-s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*$$([^)]*)$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp ++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 ++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 +@@ -15427,13 +17815,13 @@ + # 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]*,/* & */, ++s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, + _ACEOF + + # Break up conftest.defines because some shells have a limit on the size + # of here documents, and old seds have small limits too (100 cmds). + echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS ++echo ' if 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 +@@ -15442,7 +17830,7 @@ + # 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 ++ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS +@@ -15469,7 +17857,7 @@ + # 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 ++ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS +@@ -15503,10 +17891,10 @@ + 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 || ++ 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; } +@@ -15522,10 +17910,10 @@ + 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 || ++ 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; } --- cyrus-imapd-2.2-2.2.12.orig/debian/patches/22-imapd_index_check.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50-FTBFS-gcc-4.0-fix.dpatch by Ondřej Surý +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS when compiling with gcc-4.0, there is imapopts is used before declared + +@DPATCH@ +diff -urN cyrus22-imapd-2.2.12~/tools/config2header cyrus22-imapd-2.2.12/tools/config2header +--- cyrus22-imapd-2.2.12~/tools/config2header 2004-06-22 21:02:31.000000000 +0200 ++++ cyrus22-imapd-2.2.12/tools/config2header 2005-06-22 07:56:17.180293688 +0200 +@@ -214,7 +214,6 @@ + print HFILE < +## +## 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.12.orig/debian/patches/04-add_autogen.sh.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/25-update_install-sh.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/01-fix_Makefile.in.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/02-add_mkinstalldirs.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/07-update_aclocal_and_configure.in.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/07-update_aclocal_and_configure.in.dpatch @@ -0,0 +1,1926 @@ +#! /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/aclocal.m4 /tmp/dpep.IJ03bC/complete.dpatch/aclocal.m4 +--- complete.dpatch/aclocal.m4 2005-02-14 18:59:22.000000000 +0100 ++++ /tmp/dpep.IJ03bC/complete.dpatch/aclocal.m4 2005-11-10 18:42:30.706082197 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.7.2 -*- Autoconf -*- ++# generated automatically by aclocal 1.9.5 -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,1850 +11,12 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-# isc-posix.m4 serial 2 (gettext-0.11.2) +-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +-dnl This file is free software, distributed under the terms of the GNU +-dnl General Public License. As a special exception to the GNU General +-dnl Public License, this file may be distributed as part of a program +-dnl that contains a configuration script generated by Autoconf, under +-dnl the same distribution terms as the rest of that program. +- +-# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. +- +-# This test replaces the one in autoconf. +-# Currently this macro should have the same name as the autoconf macro +-# because gettext's gettext.m4 (distributed in the automake package) +-# still uses it. Otherwise, the use in gettext.m4 makes autoheader +-# give these diagnostics: +-# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +-# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX +- +-undefine([AC_ISC_POSIX]) +- +-AC_DEFUN([AC_ISC_POSIX], +- [ +- dnl This test replaces the obsolescent AC_ISC_POSIX kludge. +- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) +- ] +-) +- +-dnl +-dnl $Id: c-attribute.m4,v 1.3 2003/10/08 20:35:24 rjs3 Exp $ +-dnl +- +-dnl +-dnl Test for __attribute__ +-dnl +- +-AC_DEFUN([CMU_C___ATTRIBUTE__], [ +-AC_MSG_CHECKING(for __attribute__) +-AC_CACHE_VAL(ac_cv___attribute__, [ +-AC_TRY_COMPILE([ +-#include +-], +-[ +-static void foo(void) __attribute__ ((noreturn)); +- +-static void +-foo(void) +-{ +- exit(1); +-} +-], +-ac_cv___attribute__=yes, +-ac_cv___attribute__=no)]) +-if test "$ac_cv___attribute__" = "yes"; then +- AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__]) +-fi +-AC_MSG_RESULT($ac_cv___attribute__) +-]) +- +- +-dnl +-dnl $Id: c-fpic.m4,v 1.2 2003/10/08 20:35:24 rjs3 Exp $ +-dnl +- +-dnl +-dnl Test for -fPIC +-dnl +- +-AC_DEFUN([CMU_C_FPIC], [ +-AC_MSG_CHECKING(if compiler supports -fPIC) +-AC_CACHE_VAL(ac_cv_fpic, [ +-save_CFLAGS=$CFLAGS +-CFLAGS="${CFLAGS} -fPIC" +-AC_TRY_COMPILE([ +-#include +-], +-[ +-static void +-foo(void) +-{ +- exit(1); +-} +-], +-ac_cv_fpic=yes, +-ac_cv_fpic=no) +-CFLAGS=$save_CFLAGS +-]) +-if test "$ac_cv_fpic" = "yes"; then +- FPIC_CFLAGS="-fPIC" +-else +- FPIC_CFLAGS="" +-fi +-AC_MSG_RESULT($ac_cv_fpic) +-]) +- +- +-dnl +-dnl Additional macros for configure.in packaged up for easier theft. +-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 It would be good if ANDREW_ADD_LIBPATH could detect if something was +-dnl already there and not redundantly add it if it is. +- +-dnl add -L(arg), and possibly (runpath switch)(arg), to LDFLAGS +-dnl (so the runpath for shared libraries is set). +-AC_DEFUN([CMU_ADD_LIBPATH], [ +- # this is CMU ADD LIBPATH +- if test "$andrew_runpath_switch" = "none" ; then +- LDFLAGS="-L$1 ${LDFLAGS}" +- else +- LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}" +- fi +-]) +- +-dnl add -L(1st arg), and possibly (runpath switch)(1st arg), to (2nd arg) +-dnl (so the runpath for shared libraries is set). +-AC_DEFUN([CMU_ADD_LIBPATH_TO], [ +- # this is CMU ADD LIBPATH TO +- if test "$andrew_runpath_switch" = "none" ; then +- $2="-L$1 ${$2}" +- else +- $2="-L$1 ${$2} $andrew_runpath_switch$1" +- fi +-]) +- +-dnl runpath initialization +-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}" +- ])]) +- +-dnl bsd_sockets.m4--which socket libraries do we need? +-dnl Derrick Brashear +-dnl from Zephyr +-dnl $Id: bsd_sockets.m4,v 1.9 2003/10/08 20:35:24 rjs3 Exp $ +- +-dnl Hacked on by Rob Earhart to not just toss stuff in LIBS +-dnl It now puts everything required for sockets into LIB_SOCKET +- +-AC_DEFUN([CMU_SOCKETS], [ +- save_LIBS="$LIBS" +- LIB_SOCKET="" +- AC_CHECK_FUNC(connect, :, +- AC_CHECK_LIB(nsl, gethostbyname, +- LIB_SOCKET="-lnsl $LIB_SOCKET") +- AC_CHECK_LIB(socket, connect, +- LIB_SOCKET="-lsocket $LIB_SOCKET") +- ) +- LIBS="$LIB_SOCKET $save_LIBS" +- AC_CHECK_FUNC(res_search, :, +- AC_CHECK_LIB(resolv, res_search, +- LIB_SOCKET="-lresolv $LIB_SOCKET") +- ) +- LIBS="$LIB_SOCKET $save_LIBS" +- AC_CHECK_FUNCS(dn_expand dns_lookup) +- LIBS="$save_LIBS" +- AC_SUBST(LIB_SOCKET) +- ]) +- +-dnl See whether we can use IPv6 related functions +-dnl contributed by Hajimu UMEMOTO +- +-AC_DEFUN([IPv6_CHECK_FUNC], [ +-AC_CHECK_FUNC($1, [dnl +- ac_cv_lib_socket_$1=no +- ac_cv_lib_inet6_$1=no +-], [dnl +- AC_CHECK_LIB(socket, $1, [dnl +- LIBS="$LIBS -lsocket" +- ac_cv_lib_inet6_$1=no +- ], [dnl +- AC_MSG_CHECKING([whether your system has IPv6 directory]) +- AC_CACHE_VAL(ipv6_cv_dir, [dnl +- for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do +- if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then +- break +- fi +- done])dnl +- AC_MSG_RESULT($ipv6_cv_dir) +- if test $ipv6_cv_dir = no; then +- ac_cv_lib_inet6_$1=no +- else +- if test x$ipv6_libinet6 = x; then +- ipv6_libinet6=no +- SAVELDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" +- fi +- AC_CHECK_LIB(inet6, $1, [dnl +- if test $ipv6_libinet6 = no; then +- ipv6_libinet6=yes +- LIBS="$LIBS -linet6" +- fi],)dnl +- if test $ipv6_libinet6 = no; then +- LDFLAGS="$SAVELDFLAGS" +- fi +- fi])dnl +-])dnl +-ipv6_cv_$1=no +-if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \ +- -o $ac_cv_lib_inet6_$1 = yes +-then +- ipv6_cv_$1=yes +-fi +-if test $ipv6_cv_$1 = no; then +- if test $1 = getaddrinfo; then +- for ipv6_cv_pfx in o n; do +- AC_EGREP_HEADER(${ipv6_cv_pfx}$1, netdb.h, +- [AC_CHECK_FUNC(${ipv6_cv_pfx}$1)]) +- if eval test X\$ac_cv_func_${ipv6_cv_pfx}$1 = Xyes; then +- AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?]) +- ipv6_cv_$1=yes +- break +- fi +- done +- fi +-fi +-if test $ipv6_cv_$1 = yes; then +- ifelse([$2], , :, [$2]) +-else +- ifelse([$3], , :, [$3]) +-fi]) +- +- +-dnl See whether we have ss_family in sockaddr_storage +-AC_DEFUN([IPv6_CHECK_SS_FAMILY], [ +-AC_MSG_CHECKING([whether you have ss_family in struct sockaddr_storage]) +-AC_CACHE_VAL(ipv6_cv_ss_family, [dnl +-AC_TRY_COMPILE([#include +-#include ], +- [struct sockaddr_storage ss; int i = ss.ss_family;], +- [ipv6_cv_ss_family=yes], [ipv6_cv_ss_family=no])])dnl +-if test $ipv6_cv_ss_family = yes; then +- ifelse([$1], , AC_DEFINE(HAVE_SS_FAMILY,[],[Is there an ss_family in sockaddr_storage?]), [$1]) +-else +- ifelse([$2], , :, [$2]) +-fi +-AC_MSG_RESULT($ipv6_cv_ss_family)]) +- +- +-dnl whether you have sa_len in struct sockaddr +-AC_DEFUN([IPv6_CHECK_SA_LEN], [ +-AC_MSG_CHECKING([whether you have sa_len in struct sockaddr]) +-AC_CACHE_VAL(ipv6_cv_sa_len, [dnl +-AC_TRY_COMPILE([#include +-#include ], +- [struct sockaddr sa; int i = sa.sa_len;], +- [ipv6_cv_sa_len=yes], [ipv6_cv_sa_len=no])])dnl +-if test $ipv6_cv_sa_len = yes; then +- ifelse([$1], , AC_DEFINE(HAVE_SOCKADDR_SA_LEN,[],[Does sockaddr have an sa_len?]), [$1]) +-else +- ifelse([$2], , :, [$2]) +-fi +-AC_MSG_RESULT($ipv6_cv_sa_len)]) +- +- +-dnl See whether sys/socket.h has socklen_t +-AC_DEFUN([IPv6_CHECK_SOCKLEN_T], [ +-AC_MSG_CHECKING(for socklen_t) +-AC_CACHE_VAL(ipv6_cv_socklen_t, [dnl +-AC_TRY_LINK([#include +-#include ], +- [socklen_t len = 0;], +- [ipv6_cv_socklen_t=yes], [ipv6_cv_socklen_t=no])])dnl +-if test $ipv6_cv_socklen_t = yes; then +- ifelse([$1], , AC_DEFINE(HAVE_SOCKLEN_T,[],[Do we have a socklen_t?]), [$1]) +-else +- ifelse([$2], , :, [$2]) +-fi +-AC_MSG_RESULT($ipv6_cv_socklen_t)]) +- +- +-dnl $Id: berkdb.m4,v 1.19 2005/01/06 20:24:52 shadow Exp $ +- +-AC_DEFUN([CMU_DB_INC_WHERE1], [ +-saved_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$saved_CPPFLAGS -I$1" +-AC_TRY_COMPILE([#include ], +-[DB *db; +-db_create(&db, NULL, 0); +-db->open(db, "foo.db", NULL, DB_UNKNOWN, DB_RDONLY, 0644);], +-ac_cv_found_db_inc=yes, +-ac_cv_found_db_inc=no) +-CPPFLAGS=$saved_CPPFLAGS +-]) +- +-AC_DEFUN([CMU_DB_INC_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for db headers in $i) +- CMU_DB_INC_WHERE1($i) +- CMU_TEST_INCPATH($i, db) +- if test "$ac_cv_found_db_inc" = "yes"; then +- ac_cv_db_where_inc=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-# +-# Test for lib files +-# +- +-AC_DEFUN([CMU_DB3_LIB_WHERE1], [ +-AC_REQUIRE([CMU_AFS]) +-AC_REQUIRE([CMU_KRB4]) +-saved_LIBS=$LIBS +- LIBS="$saved_LIBS -L$1 -ldb-3" +-AC_TRY_LINK([#include ], +-[db_env_create(NULL, 0);], +-[ac_cv_found_db_3_lib=yes], +-ac_cv_found_db_3_lib=no) +-LIBS=$saved_LIBS +-]) +-AC_DEFUN([CMU_DB4_LIB_WHERE1], [ +-AC_REQUIRE([CMU_AFS]) +-AC_REQUIRE([CMU_KRB4]) +-saved_LIBS=$LIBS +-LIBS="$saved_LIBS -L$1 -ldb-4" +-AC_TRY_LINK([#include ], +-[db_env_create(NULL, 0);], +-[ac_cv_found_db_4_lib=yes], +-ac_cv_found_db_4_lib=no) +-LIBS=$saved_LIBS +-]) +- +-AC_DEFUN([CMU_DB_LIB_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for db libraries in $i) +-if test "$enable_db4" = "yes"; then +- CMU_DB4_LIB_WHERE1($i) +- CMU_TEST_LIBPATH($i, [db-4]) +- ac_cv_found_db_lib=$ac_cv_found_db_4_lib +-else +- CMU_DB3_LIB_WHERE1($i) +- CMU_TEST_LIBPATH($i, [db-3]) +- ac_cv_found_db_lib=$ac_cv_found_db_3_lib +-fi +- if test "$ac_cv_found_db_lib" = "yes" ; then +- ac_cv_db_where_lib=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-AC_DEFUN([CMU_USE_DB], [ +-AC_ARG_WITH(db, +- [ --with-db=PREFIX Compile with db support], +- [if test "X$with_db" = "X"; then +- with_db=yes +- fi]) +-AC_ARG_WITH(db-lib, +- [ --with-db-lib=dir use db libraries in dir], +- [if test "$withval" = "yes" -o "$withval" = "no"; then +- AC_MSG_ERROR([No argument for --with-db-lib]) +- fi]) +-AC_ARG_WITH(db-include, +- [ --with-db-include=dir use db headers in dir], +- [if test "$withval" = "yes" -o "$withval" = "no"; then +- AC_MSG_ERROR([No argument for --with-db-include]) +- fi]) +-AC_ARG_ENABLE(db4, +- [ --enable-db4 use db 4.x libraries]) +- +- if test "X$with_db" != "X"; then +- if test "$with_db" != "yes"; then +- ac_cv_db_where_lib=$with_db/lib +- ac_cv_db_where_inc=$with_db/include +- fi +- fi +- +- if test "X$with_db_lib" != "X"; then +- ac_cv_db_where_lib=$with_db_lib +- fi +- if test "X$ac_cv_db_where_lib" = "X"; then +- CMU_DB_LIB_WHERE(/usr/athena/lib /usr/lib /usr/local/lib) +- fi +- +- if test "X$with_db_include" != "X"; then +- ac_cv_db_where_inc=$with_db_include +- fi +- if test "X$ac_cv_db_where_inc" = "X"; then +- CMU_DB_INC_WHERE(/usr/athena/include /usr/local/include) +- fi +- +- AC_MSG_CHECKING(whether to include db) +- if test "X$ac_cv_db_where_lib" = "X" -o "X$ac_cv_db_where_inc" = "X"; then +- ac_cv_found_db=no +- AC_MSG_RESULT(no) +- else +- ac_cv_found_db=yes +- AC_MSG_RESULT(yes) +- DB_INC_DIR=$ac_cv_db_where_inc +- DB_LIB_DIR=$ac_cv_db_where_lib +- DB_INC_FLAGS="-I${DB_INC_DIR}" +- if test "$enable_db4" = "yes"; then +- DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-4" +- else +- DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-3" +- fi +- dnl Do not force configure.in to put these in CFLAGS and LIBS unconditionally +- dnl Allow makefile substitutions.... +- AC_SUBST(DB_INC_FLAGS) +- AC_SUBST(DB_LIB_FLAGS) +- if test "X$RPATH" = "X"; then +- RPATH="" +- fi +- case "${host}" in +- *-*-linux*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-rpath,${DB_LIB_DIR}" +- else +- RPATH="${RPATH}:${DB_LIB_DIR}" +- fi +- ;; +- *-*-hpux*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,+b${DB_LIB_DIR}" +- else +- RPATH="${RPATH}:${DB_LIB_DIR}" +- fi +- ;; +- *-*-irix*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-rpath,${DB_LIB_DIR}" +- else +- RPATH="${RPATH}:${DB_LIB_DIR}" +- fi +- ;; +- *-*-solaris2*) +- if test "$ac_cv_prog_gcc" = yes; then +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-R${DB_LIB_DIR}" +- else +- RPATH="${RPATH}:${DB_LIB_DIR}" +- fi +- else +- RPATH="${RPATH} -R${DB_LIB_DIR}" +- fi +- ;; +- esac +- AC_SUBST(RPATH) +- fi +- ]) +- +- +- +-dnl ---- CUT HERE --- +- +-dnl These are the Cyrus Berkeley DB macros. In an ideal world these would be +-dnl identical to the above. +- +-dnl They are here so that they can be shared between Cyrus IMAPd +-dnl and Cyrus SASL with relative ease. +- +-dnl The big difference between this and the ones above is that we don't assume +-dnl that we know the name of the library, and we try a lot of permutations +-dnl instead. We also assume that DB4 is acceptable. +- +-dnl When we're done, there will be a BDB_LIBADD and a BDB_INCADD which should +-dnl be used when necessary. We should probably be smarter about our RPATH +-dnl handling. +- +-dnl Call these with BERKELEY_DB_CHK. +- +-dnl We will also set $dblib to "berkeley" if we are successful, "no" otherwise. +- +-dnl this is unbelievably painful due to confusion over what db-3 should be +-dnl named and where the db-3 header file is located. arg. +-AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], +-[ +- BDB_SAVE_LDFLAGS=$LDFLAGS +- +- if test -d $with_bdb_lib; then +- CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS) +- CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD) +- else +- BDB_LIBADD="" +- fi +- +- saved_LIBS=$LIBS +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- do +- LIBS="$saved_LIBS -l$dbname" +- AC_TRY_LINK([#include ], +- [db_create(NULL, NULL, 0);], +- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, +- dblib="no") +- if test "$dblib" = "berkeley"; then break; fi +- done +- if test "$dblib" = "no"; then +- LIBS="$saved_LIBS -ldb" +- AC_TRY_LINK([#include ], +- [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);], +- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db, +- dblib="no") +- fi +- LIBS=$saved_LIBS +- +- LDFLAGS=$BDB_SAVE_LDFLAGS +-]) +- +-AC_DEFUN([CYRUS_BERKELEY_DB_OPTS], +-[ +-AC_ARG_WITH(bdb-libdir, +- [ --with-bdb-libdir=DIR Berkeley DB lib files are in DIR], +- with_bdb_lib=$withval, +- [ test "${with_bdb_lib+set}" = set || with_bdb_lib=none]) +-AC_ARG_WITH(bdb-incdir, +- [ --with-bdb-incdir=DIR Berkeley DB include files are in DIR], +- with_bdb_inc=$withval, +- [ test "${with_bdb_inc+set}" = set || with_bdb_inc=none ]) +-]) +- +-AC_DEFUN([CYRUS_BERKELEY_DB_CHK], +-[ +- AC_REQUIRE([CYRUS_BERKELEY_DB_OPTS]) +- +- cmu_save_CPPFLAGS=$CPPFLAGS +- +- if test -d $with_bdb_inc; then +- CPPFLAGS="$CPPFLAGS -I$with_bdb_inc" +- BDB_INCADD="-I$with_bdb_inc" +- else +- BDB_INCADD="" +- fi +- +- dnl Note that FreeBSD puts it in a wierd place +- dnl (but they should use with-bdb-incdir) +- AC_CHECK_HEADER(db.h, +- [CYRUS_BERKELEY_DB_CHK_LIB()], +- dblib="no") +- +- CPPFLAGS=$cmu_save_CPPFLAGS +-]) +- +-dnl $Id: common.m4,v 1.11 2003/10/08 20:35:24 rjs3 Exp $ +- +-AC_DEFUN([CMU_TEST_LIBPATH], [ +-changequote(<<, >>) +-define(<>, translit(ac_cv_found_$2_lib, <<- *>>, <<__p>>)) +-changequote([, ]) +-if test "$CMU_AC_CV_FOUND" = "yes"; then +- if test \! -r "$1/lib$2.a" -a \! -r "$1/lib$2.so" -a \! -r "$1/lib$2.sl"; then +- CMU_AC_CV_FOUND=no +- fi +-fi +-]) +- +-AC_DEFUN([CMU_TEST_INCPATH], [ +-changequote(<<, >>) +-define(<>, translit(ac_cv_found_$2_inc, [ *], [_p])) +-changequote([, ]) +-if test "$CMU_AC_CV_FOUND" = "yes"; then +- if test \! -r "$1/$2.h"; then +- CMU_AC_CV_FOUND=no +- fi +-fi +-]) +- +-dnl CMU_CHECK_HEADER_NOCACHE(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +-AC_DEFUN([CMU_CHECK_HEADER_NOCACHE], +-[dnl Do the transliteration at runtime so arg 1 can be a shell variable. +-ac_safe=`echo "$1" | sed 'y%./+-%__p_%'` +-AC_MSG_CHECKING([for $1]) +-AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes", +- eval "ac_cv_header_$ac_safe=no") +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +-else +- AC_MSG_RESULT(no) +-ifelse([$3], , , [$3 +-])dnl +-fi +-]) +- +-dnl afs.m4--AFS libraries, includes, and dependencies +-dnl $Id: afs.m4,v 1.28 2004/04/29 22:00:07 cg2v Exp $ +-dnl Chaskiel Grundman +-dnl based on kerberos_v4.m4 +-dnl Derrick Brashear +-dnl from KTH krb and Arla +- +-AC_DEFUN([CMU_AFS_INC_WHERE1], [ +-cmu_save_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$cmu_save_CPPFLAGS -I$1" +-AC_TRY_COMPILE([#include ], +-[#ifndef SYS_NAME +-choke me +-#endif +-int foo;], +-ac_cv_found_afs_inc=yes, +-ac_cv_found_afs_inc=no) +-CPPFLAGS=$cmu_save_CPPFLAGS +-]) +- +-AC_DEFUN([CMU_AFS_LIB_WHERE1], [ +-save_LIBS="$LIBS" +-save_LDFLAGS="$LDFLAGS" +- +-LIBS="-lauth $1/afs/util.a $LIB_SOCKET $LIBS" +-LDFLAGS="-L$1 -L$1/afs $LDFLAGS" +-dnl suppress caching +-AC_TRY_LINK([],[afsconf_Open();], ac_cv_found_afs_lib=yes, ac_cv_found_afs_lib=no) +-LIBS="$save_LIBS" +-LDFLAGS="$save_LDFLAGS" +-]) +- +-AC_DEFUN([CMU_AFS_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for AFS in $i) +- CMU_AFS_INC_WHERE1("$i/include") +- ac_cv_found_lwp_inc=$ac_cv_found_afs_inc +- CMU_TEST_INCPATH($i/include, lwp) +- ac_cv_found_afs_inc=$ac_cv_found_lwp_inc +- if test "$ac_cv_found_afs_inc" = "yes"; then +- CMU_AFS_LIB_WHERE1("$i/lib") +- if test "$ac_cv_found_afs_lib" = "yes"; then +- ac_cv_afs_where=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-AC_DEFUN([CMU_AFS], [ +-AC_REQUIRE([CMU_SOCKETS]) +-AC_REQUIRE([CMU_LIBSSL]) +-AC_ARG_WITH(AFS, +- [ --with-afs=PREFIX Compile with AFS support], +- [if test "X$with_AFS" = "X"; then +- with_AFS=yes +- fi]) +- +- if test "X$with_AFS" != "X"; then +- ac_cv_afs_where=$with_AFS +- fi +- if test "X$ac_cv_afs_where" = "X"; then +- CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools) +- fi +- +- AC_MSG_CHECKING(whether to include AFS) +- if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then +- ac_cv_found_afs=no +- AC_MSG_RESULT(no) +- else +- ac_cv_found_afs=yes +- AC_MSG_RESULT(yes) +- AFS_INC_DIR="$ac_cv_afs_where/include" +- AFS_LIB_DIR="$ac_cv_afs_where/lib" +- AFS_TOP_DIR="$ac_cv_afs_where" +- AFS_INC_FLAGS="-I${AFS_INC_DIR}" +- AFS_LIB_FLAGS="-L${AFS_LIB_DIR} -L${AFS_LIB_DIR}/afs" +- cmu_save_LIBS="$LIBS" +- cmu_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS ${AFS_INC_FLAGS}" +- cmu_save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}" +- +- AC_CHECK_HEADERS(afs/stds.h) +- +- AC_MSG_CHECKING([if libdes is needed]) +- AC_TRY_LINK([],[des_quad_cksum();],AFS_DES_LIB="",AFS_DES_LIB="maybe") +- if test "X$AFS_DES_LIB" != "X"; then +- LIBS="$cmu_save_LIBS -ldes" +- AC_TRY_LINK([], [des_quad_cksum();],AFS_DES_LIB="yes") +- if test "X$AFS_DES_LIB" = "Xyes"; then +- AC_MSG_RESULT([yes]) +- AFS_LIBDES="-ldes" +- AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a" +- else +- LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS" +- AC_TRY_LINK([], +- [des_quad_cksum();],AFS_DES_LIB="libcrypto") +- if test "X$AFS_DES_LIB" = "Xlibcrypto"; then +- AC_MSG_RESULT([libcrypto]) +- AFS_LIBDES="$LIBSSL_LIB_FLAGS" +- AFS_LIBDESA="$LIBSSL_LIB_FLAGS" +- else +- AC_MSG_RESULT([unknown]) +- AC_MSG_ERROR([Could not use -ldes]) +- fi +- fi +- else +- AC_MSG_RESULT([no]) +- fi +- +- +- AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a" +- AFS_KTC_LIBS_STATIC="${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a" +- AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a" +- AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a" +- AFS_KTC_LIBS="-lauth ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcom_err ${AFS_LIB_DIR}/afs/util.a" +- +- LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}" +- AC_CHECK_FUNC(des_pcbc_init) +- if test "X$ac_cv_func_des_pcbc_init" != "Xyes"; then +- AC_CHECK_LIB(descompat, des_pcbc_init, AFS_DESCOMPAT_LIB="-ldescompat") +- if test "X$AFS_DESCOMPAT_LIB" != "X" ; then +- AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_DESCOMPAT_LIB" +- AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_DESCOMPAT_LIB" +- AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_DESCOMPAT_LIB" +- AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_DESCOMPAT_LIB" +- else +- +- AC_MSG_CHECKING([if rxkad needs des_pcbc_init]) +- AC_TRY_LINK(,[tkt_DecodeTicket();],RXKAD_PROBLEM=no,RXKAD_PROBLEM=maybe) +- if test "$RXKAD_PROBLEM" = "maybe"; then +- AC_TRY_LINK([int des_pcbc_init() { return 0;}], +- [tkt_DecodeTicket();],RXKAD_PROBLEM=yes,RXKAD_PROBLEM=error) +- if test "$RXKAD_PROBLEM" = "yes"; then +- AC_MSG_RESULT([yes]) +- AC_MSG_ERROR([cannot use rxkad]) +- else +- AC_MSG_RESULT([unknown]) +- AC_MSG_ERROR([Unknown error testing rxkad]) +- fi +- else +- AC_MSG_RESULT([no]) +- fi +- fi +- fi +- +- LIBS="$cmu_save_LIBS" +- AC_CHECK_FUNC(flock) +- LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}" +- if test "X$ac_cv_func_flock" != "Xyes"; then +- AC_MSG_CHECKING([if AFS needs flock]) +- AC_TRY_LINK([#include +-#ifdef HAVE_AFS_STDS_H +-#include +-#endif +-#include +-#include +-#include +-#include +-struct ubik_client * cstruct; +-int sigvec() {return 0;} +-extern int UV_SetSecurity();], +- [vsu_ClientInit(1,"","",0, +- &cstruct,UV_SetSecurity)], +- AFS_FLOCK=no,AFS_FLOCK=yes) +- if test $AFS_FLOCK = "no"; then +- AC_MSG_RESULT([no]) +- else +- AC_MSG_RESULT([yes]) +- LDFLAGS="$LDFLAGS -L/usr/ucblib" +- AC_CHECK_LIB(ucb, flock,:, [AC_CHECK_LIB(BSD, flock)]) +- fi +- fi +- LIBS="$cmu_save_LIBS" +- AC_CHECK_FUNC(sigvec) +- LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}" +- if test "X$ac_cv_func_sigvec" != "Xyes"; then +- AC_MSG_CHECKING([if AFS needs sigvec]) +- AC_TRY_LINK([#include +-#ifdef HAVE_AFS_STDS_H +-#include +-#endif +-#include +-#include +-#include +-#include +-struct ubik_client * cstruct; +-int flock() {return 0;} +-extern int UV_SetSecurity();], +- [vsu_ClientInit(1,"","",0, +- &cstruct,UV_SetSecurity)], +- AFS_SIGVEC=no,AFS_SIGVEC=yes) +- if test $AFS_SIGVEC = "no"; then +- AC_MSG_RESULT([no]) +- else +- AC_MSG_RESULT([yes]) +- LDFLAGS="$LDFLAGS -L/usr/ucblib" +- AC_CHECK_LIB(ucb, sigvec,:,[AC_CHECK_LIB(BSD, sigvec)]) +- fi +- fi +- if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then +- AFS_LIB_FLAGS="${AFS_LIB_FLAGS} -L/usr/ucblib -R/usr/ucblib" +- fi +- if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then +- AFS_BSD_LIB="-lucb" +- elif test "$ac_cv_lib_BSD_flock" = "yes" -o "$ac_cv_lib_BSD_sigvec" = "yes"; then +- AFS_BSD_LIB="-lBSD" +- fi +- if test "X$AFS_BSD_LIB" != "X" ; then +- AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_BSD_LIB" +- AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_BSD_LIB" +- AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB" +- AFS_RX_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB" +- AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_BSD_LIB" +- fi +- +- AC_MSG_CHECKING([if libaudit is needed]) +- AFS_LIBAUDIT="" +- LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}" +- AC_TRY_LINK([#include +-#ifdef HAVE_AFS_STDS_H +-#include +-#endif +-#include +-#include ], +- [afsconf_SuperUser();],AFS_AUDIT_LIB="",AFS_AUDIT_LIB="maybe") +- if test "X$AFS_AUDIT_LIB" != "X"; then +- LIBS="$cmu_save_LIBS -lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB $LIB_SOCKET" +- AC_TRY_LINK([#include +-#ifdef HAVE_AFS_STDS_H +-#include +-#endif +-#include +-#include ], +- [afsconf_SuperUser();],AFS_AUDIT_LIB="yes") +- if test "X$AFS_AUDIT_LIB" = "Xyes"; then +- AC_MSG_RESULT([yes]) +- AFS_LIBAUDIT="-laudit" +- AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a" +- AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB" +- AFS_RX_LIBS="-lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB" +- else +- AC_MSG_RESULT([unknown]) +- AC_MSG_ERROR([Could not use -lauth while testing for -laudit]) +- fi +- else +- AC_MSG_RESULT([no]) +- fi +- +- AC_CHECK_FUNCS(VL_ProbeServer) +- AC_MSG_CHECKING([if new-style afs_ integer types are defined]) +- AC_CACHE_VAL(ac_cv_afs_int32, +-dnl The next few lines contain a quoted argument to egrep +-dnl It is critical that there be no leading or trailing whitespace +-dnl or newlines +-[AC_EGREP_CPP(dnl +-changequote(<<,>>)dnl +-<<(^|[^a-zA-Z_0-9])afs_int32[^a-zA-Z_0-9]>>dnl +-changequote([,]), [#include +-#ifdef HAVE_AFS_STDS_H +-#include +-#endif], +-ac_cv_afs_int32=yes, ac_cv_afs_int32=no)]) +- AC_MSG_RESULT($ac_cv_afs_int32) +- if test $ac_cv_afs_int32 = yes ; then +- AC_DEFINE(HAVE_AFS_INT32,, [AFS provides new "unambiguous" type names]) +- else +- AC_DEFINE(afs_int16, int16, [it's a type definition]) +- AC_DEFINE(afs_int32, int32, [it's a type definition]) +- AC_DEFINE(afs_uint16, u_int16, [it's a type definition]) +- AC_DEFINE(afs_uint32, u_int32, [it's a type definition]) +- fi +- +- CPPFLAGS="${cmu_save_CPPFLAGS}" +- LDFLAGS="${cmu_save_LDFLAGS}" +- LIBS="${cmu_save_LIBS}" +- AC_DEFINE(AFS_ENV,, [Use AFS. (find what needs this and nuke it)]) +- AC_DEFINE(AFS,, [Use AFS. (find what needs this and nuke it)]) +- AC_SUBST(AFS_CLIENT_LIBS_STATIC) +- AC_SUBST(AFS_KTC_LIBS_STATIC) +- AC_SUBST(AFS_CLIENT_LIBS) +- AC_SUBST(AFS_RX_LIBS) +- AC_SUBST(AFS_KTC_LIBS) +- AC_SUBST(AFS_INC_FLAGS) +- AC_SUBST(AFS_LIB_FLAGS) +- AC_SUBST(AFS_TOP_DIR) +- AC_SUBST(AFS_LIBAUDIT) +- AC_SUBST(AFS_LIBDES) +- AC_SUBST(AFS_LIBDESA) +- fi +- ]) +- +-AC_DEFUN([CMU_NEEDS_AFS], +-[AC_REQUIRE([CMU_AFS]) +-if test "$ac_cv_found_afs" != "yes"; then +- AC_ERROR([Cannot continue without AFS]) +-fi]) +- +-dnl libssl.m4--Ssl libraries and includes +-dnl Derrick Brashear +-dnl from KTH kafs and Arla +-dnl $Id: libssl.m4,v 1.9 2003/10/08 20:35:25 rjs3 Exp $ +- +-AC_DEFUN([CMU_LIBSSL_INC_WHERE1], [ +-saved_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$saved_CPPFLAGS -I$1" +-CMU_CHECK_HEADER_NOCACHE(openssl/ssl.h, +-ac_cv_found_libssl_inc=yes, +-ac_cv_found_libssl_inc=no) +-CPPFLAGS=$saved_CPPFLAGS +-]) +- +-AC_DEFUN([CMU_LIBSSL_INC_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for libssl headers in $i) +- CMU_LIBSSL_INC_WHERE1($i) +- CMU_TEST_INCPATH($i, ssl) +- if test "$ac_cv_found_libssl_inc" = "yes"; then +- ac_cv_libssl_where_inc=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-AC_DEFUN([CMU_LIBSSL_LIB_WHERE1], [ +-saved_LIBS=$LIBS +-LIBS="$saved_LIBS -L$1 -lssl -lcrypto $LIB_SOCKET" +-AC_TRY_LINK(, +-[SSL_write();], +-[ac_cv_found_ssl_lib=yes], +-ac_cv_found_ssl_lib=no) +-LIBS=$saved_LIBS +-]) +- +-AC_DEFUN([CMU_LIBSSL_LIB_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for libssl libraries in $i) +- CMU_LIBSSL_LIB_WHERE1($i) +- dnl deal with false positives from implicit link paths +- CMU_TEST_LIBPATH($i, ssl) +- if test "$ac_cv_found_ssl_lib" = "yes" ; then +- ac_cv_libssl_where_lib=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-AC_DEFUN([CMU_LIBSSL], [ +-AC_REQUIRE([CMU_SOCKETS]) +-AC_ARG_WITH(libssl, +- [ --with-libssl=PREFIX Compile with Libssl support], +- [if test "X$with_libssl" = "X"; then +- with_libssl=yes +- fi]) +-AC_ARG_WITH(libssl-lib, +- [ --with-libssl-lib=dir use libssl libraries in dir], +- [if test "$withval" = "yes" -o "$withval" = "no"; then +- AC_MSG_ERROR([No argument for --with-libssl-lib]) +- fi]) +-AC_ARG_WITH(libssl-include, +- [ --with-libssl-include=dir use libssl headers in dir], +- [if test "$withval" = "yes" -o "$withval" = "no"; then +- AC_MSG_ERROR([No argument for --with-libssl-include]) +- fi]) +- +- if test "X$with_libssl" != "X"; then +- if test "$with_libssl" != "yes" -a "$with_libssl" != no; then +- ac_cv_libssl_where_lib=$with_libssl/lib +- ac_cv_libssl_where_inc=$with_libssl/include +- fi +- fi +- +- if test "$with_libssl" != "no"; then +- if test "X$with_libssl_lib" != "X"; then +- ac_cv_libssl_where_lib=$with_libssl_lib +- fi +- if test "X$ac_cv_libssl_where_lib" = "X"; then +- CMU_LIBSSL_LIB_WHERE(/usr/local/lib/openssl /usr/lib/openssl /usr/local/lib /usr/lib) +- fi +- +- if test "X$with_libssl_include" != "X"; then +- ac_cv_libssl_where_inc=$with_libssl_include +- fi +- if test "X$ac_cv_libssl_where_inc" = "X"; then +- CMU_LIBSSL_INC_WHERE(/usr/local/include /usr/include) +- fi +- fi +- +- AC_MSG_CHECKING(whether to include libssl) +- if test "X$ac_cv_libssl_where_lib" = "X" -a "X$ac_cv_libssl_where_inc" = "X"; then +- ac_cv_found_libssl=no +- AC_MSG_RESULT(no) +- else +- ac_cv_found_libssl=yes +- AC_MSG_RESULT(yes) +- LIBSSL_INC_DIR=$ac_cv_libssl_where_inc +- LIBSSL_LIB_DIR=$ac_cv_libssl_where_lib +- LIBSSL_INC_FLAGS="-I${LIBSSL_INC_DIR}" +- LIBSSL_LIB_FLAGS="-L${LIBSSL_LIB_DIR} -lssl -lcrypto" +- if test "X$RPATH" = "X"; then +- RPATH="" +- fi +- case "${host}" in +- *-*-linux*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}" +- else +- RPATH="${RPATH}:${LIBSSL_LIB_DIR}" +- fi +- ;; +- *-*-hpux*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,+b${LIBSSL_LIB_DIR}" +- else +- RPATH="${RPATH}:${LIBSSL_LIB_DIR}" +- fi +- ;; +- *-*-irix*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}" +- else +- RPATH="${RPATH}:${LIBSSL_LIB_DIR}" +- fi +- ;; +- *-*-solaris2*) +- if test "$ac_cv_prog_gcc" = yes; then +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-R${LIBSSL_LIB_DIR}" +- else +- RPATH="${RPATH}:${LIBSSL_LIB_DIR}" +- fi +- else +- RPATH="${RPATH} -R${LIBSSL_LIB_DIR}" +- fi +- ;; +- esac +- AC_SUBST(RPATH) +- fi +- AC_SUBST(LIBSSL_INC_DIR) +- AC_SUBST(LIBSSL_LIB_DIR) +- AC_SUBST(LIBSSL_INC_FLAGS) +- AC_SUBST(LIBSSL_LIB_FLAGS) +- ]) +- +- +-dnl kerberos_v4.m4--Kerberos 4 libraries and includes +-dnl Derrick Brashear +-dnl from KTH krb and Arla +-dnl $Id: kerberos_v4.m4,v 1.27 2004/02/05 18:28:47 cg2v Exp $ +- +-AC_DEFUN([CMU_KRB_SENDAUTH_PROTO], [ +-AC_MSG_CHECKING(for krb_sendauth prototype) +-AC_TRY_COMPILE( +-[#include +-int krb_sendauth (long options, int fd, KTEXT ktext, char *service, +- char *inst, char *realm, u_long checksum, +- MSG_DAT *msg_data, CREDENTIALS *cred, +- Key_schedule schedule, struct sockaddr_in *laddr, +- struct sockaddr_in *faddr, char *version);], +-[int foo = krb_sendauth(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ], +-ac_cv_krb_sendauth_proto=no, +-ac_cv_krb_sendauth_proto=yes) +-AC_MSG_RESULT($ac_cv_krb_sendauth_proto) +-if test "$ac_cv_krb_sendauth_proto" = yes; then +- AC_DEFINE(HAVE_KRB_SENDAUTH_PROTO)dnl +-fi +-AC_MSG_RESULT($ac_cv_krb_sendauth_proto) +-]) +- +-AC_DEFUN([CMU_KRB_SET_KEY_PROTO], [ +-AC_MSG_CHECKING(for krb_set_key prototype) +-AC_CACHE_VAL(ac_cv_krb_set_key_proto, [ +-cmu_save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}" +-AC_TRY_COMPILE( +-[#include +-int krb_set_key(char *key, int cvt);], +-[int foo = krb_set_key(0, 0);], +-ac_cv_krb_set_key_proto=no, +-ac_cv_krb_set_key_proto=yes) +-]) +-CPPFLAGS="${cmu_save_CPPFLAGS}" +-if test "$ac_cv_krb_set_key_proto" = yes; then +- AC_DEFINE(HAVE_KRB_SET_KEY_PROTO)dnl +-fi +-AC_MSG_RESULT($ac_cv_krb_set_key_proto) +-]) +- +-AC_DEFUN([CMU_KRB4_32_DEFN], [ +-AC_MSG_CHECKING(for KRB4_32 definition) +-AC_CACHE_VAL(ac_cv_krb4_32_defn, [ +-cmu_save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}" +-AC_TRY_COMPILE( +-[#include +-], +-[KRB4_32 foo = 1;], +-ac_cv_krb4_32_defn=yes, +-ac_cv_krb4_32_defn=no) +-]) +-CPPFLAGS="${cmu_save_CPPFLAGS}" +-if test "$ac_cv_krb4_32_defn" = yes; then +- AC_DEFINE(HAVE_KRB4_32_DEFINE)dnl +-fi +-AC_MSG_RESULT($ac_cv_krb4_32_defn) +-]) +- +-AC_DEFUN([CMU_KRB_RD_REQ_PROTO], [ +-AC_MSG_CHECKING(for krb_rd_req prototype) +-AC_CACHE_VAL(ac_cv_krb_rd_req_proto, [ +-cmu_save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}" +-AC_TRY_COMPILE( +-[#include +-int krb_rd_req(KTEXT authent, char *service, char *instance, +-unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn);], +-[int foo = krb_rd_req(0,0,0,0,0,0);], +-ac_cv_krb_rd_req_proto=no, +-ac_cv_krb_rd_req_proto=yes) +-]) +-CPPFLAGS="${cmu_save_CPPFLAGS}" +-if test "$ac_cv_krb_rd_req_proto" = yes; then +- AC_DEFINE(HAVE_KRB_RD_REQ_PROTO)dnl +-fi +-AC_MSG_RESULT($ac_cv_krb_rd_req_proto) +-]) +- +-AC_DEFUN([CMU_KRB_INC_WHERE1], [ +-saved_CPPFLAGS=$CPPFLAGS +-CPPFLAGS="$saved_CPPFLAGS -I$1" +-AC_TRY_COMPILE([#include ], +-[struct ktext foo;], +-ac_cv_found_krb_inc=yes, +-ac_cv_found_krb_inc=no) +-if test "$ac_cv_found_krb_inc" = "no"; then +- CPPFLAGS="$saved_CPPFLAGS -I$1 -I$1/kerberosIV" +- AC_TRY_COMPILE([#include ], +- [struct ktext foo;], +- [ac_cv_found_krb_inc=yes], +- ac_cv_found_krb_inc=no) +-fi +-CPPFLAGS=$saved_CPPFLAGS +-]) +- +-AC_DEFUN([CMU_KRB_INC_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for kerberos headers in $i) +- CMU_KRB_INC_WHERE1($i) +- CMU_TEST_INCPATH($i, krb) +- if test "$ac_cv_found_krb_inc" = "yes"; then +- ac_cv_krb_where_inc=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-# +-# Test for kerberos lib files +-# +- +-AC_DEFUN([CMU_KRB_LIB_WHERE1], [ +-saved_LIBS=$LIBS +-LIBS="$saved_LIBS -L$1 -lkrb ${KRB_LIBDES}" +-AC_TRY_LINK(, +-[dest_tkt();], +-[ac_cv_found_krb_lib=yes], +-ac_cv_found_krb_lib=no) +-LIBS=$saved_LIBS +-]) +- +-AC_DEFUN([CMU_KRB_LIB_WHERE], [ +- for i in $1; do +- AC_MSG_CHECKING(for kerberos libraries in $i) +- CMU_KRB_LIB_WHERE1($i) +- dnl deal with false positives from implicit link paths +- CMU_TEST_LIBPATH($i, krb) +- if test "$ac_cv_found_krb_lib" = "yes" ; then +- ac_cv_krb_where_lib=$i +- AC_MSG_RESULT(found) +- break +- else +- AC_MSG_RESULT(not found) +- fi +- done +-]) +- +-AC_DEFUN([CMU_KRB4], [ +-AC_REQUIRE([CMU_SOCKETS]) +-AC_REQUIRE([CMU_LIBSSL]) +-AC_ARG_WITH(krb4, +- [ --with-krb4=PREFIX Compile with Kerberos 4 support], +- [if test "X$with_krb4" = "X"; then +- with_krb4=yes +- fi]) +-AC_ARG_WITH(krb4-lib, +- [ --with-krb4-lib=dir use kerberos 4 libraries in dir], +- [if test "$withval" = "yes" -o "$withval" = "no"; then +- AC_MSG_ERROR([No argument for --with-krb4-lib]) +- fi]) +-AC_ARG_WITH(krb4-include, +- [ --with-krb4-include=dir use kerberos 4 headers in dir], +- [if test "$withval" = "yes" -o "$withval" = "no"; then +- AC_MSG_ERROR([No argument for --with-krb4-include]) +- fi]) +- +- if test "X$with_krb4" != "X"; then +- if test "$with_krb4" != "yes" -a "$with_krb4" != "no"; then +- ac_cv_krb_where_lib=$with_krb4/lib +- ac_cv_krb_where_inc=$with_krb4/include +- fi +- fi +- +- if test "$with_krb4" != "no"; then +- if test "X$with_krb4_lib" != "X"; then +- ac_cv_krb_where_lib=$with_krb4_lib +- fi +- if test "X$with_krb4_include" != "X"; then +- ac_cv_krb_where_inc=$with_krb4_include +- fi +- if test "X$ac_cv_krb_where_inc" = "X"; then +- CMU_KRB_INC_WHERE(/usr/athena/include /usr/include/kerberosIV /usr/local/include /usr/include/kerberos) +- fi +- +- AC_MSG_CHECKING([if libdes is needed]) +- AC_TRY_LINK([],[des_quad_cksum();],KRB_DES_LIB="",KRB_DES_LIB="maybe") +- if test "X$KRB_DES_LIB" != "X"; then +- LIBS="$cmu_save_LIBS -ldes" +- AC_TRY_LINK([], [des_quad_cksum();],KRB_DES_LIB="yes") +- if test "X$KRB_DES_LIB" = "Xyes"; then +- AC_MSG_RESULT([yes]) +- KRB_LIBDES="-ldes" +- KRB_LIBDESA='$(KRB_LIB_DIR)/libdes.a' +- else +- LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS" +- AC_TRY_LINK([], +- [des_quad_cksum();],KRB_DES_LIB="libcrypto") +- if test "X$KRB_DES_LIB" = "Xlibcrypto"; then +- AC_MSG_RESULT([libcrypto]) +- KRB_LIBDES="$LIBSSL_LIB_FLAGS" +- KRB_LIBDESA="$LIBSSL_LIB_FLAGS" +- else +- AC_MSG_RESULT([unknown]) +- AC_MSG_ERROR([Could not use -ldes]) +- fi +- fi +- else +- AC_MSG_RESULT([no]) +- fi +- if test "X$ac_cv_krb_where_lib" = "X"; then +- CMU_KRB_LIB_WHERE(/usr/athena/lib /usr/local/lib /usr/lib) +- fi +- fi +- LIBS="${cmu_save_LIBS}" +- +- +- AC_MSG_CHECKING([whether to include kerberos 4]) +- if test "X$ac_cv_krb_where_lib" = "X" -o "X$ac_cv_krb_where_inc" = "X"; then +- ac_cv_found_krb=no +- AC_MSG_RESULT(no) +- else +- ac_cv_found_krb=yes +- AC_MSG_RESULT(yes) +- KRB_INC_DIR=$ac_cv_krb_where_inc +- KRB_LIB_DIR=$ac_cv_krb_where_lib +- KRB_INC_FLAGS="-I${KRB_INC_DIR}" +- KRB_LIB_FLAGS="-L${KRB_LIB_DIR} -lkrb ${KRB_LIBDES}" +- LIBS="${cmu_save_LIBS} ${KRB_LIB_FLAGS}" +- AC_CHECK_LIB(resolv, dns_lookup, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lresolv",,"${KRB_LIB_FLAGS}") +- AC_CHECK_LIB(crypt, crypt, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lcrypt",,"${KRB_LIB_FLAGS}") +- LIBS="${LIBS} ${KRB_LIB_FLAGS}" +- AC_CHECK_FUNCS(krb_get_int krb_life_to_time) +- AC_SUBST(KRB_INC_FLAGS) +- AC_SUBST(KRB_LIB_FLAGS) +- LIBS="${cmu_save_LIBS}" +- AC_DEFINE(KERBEROS,,[Use kerberos 4. find out what needs this symbol]) +- if test "X$RPATH" = "X"; then +- RPATH="" +- fi +- case "${host}" in +- *-*-linux*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-rpath,${KRB_LIB_DIR}" +- else +- RPATH="${RPATH}:${KRB_LIB_DIR}" +- fi +- ;; +- *-*-hpux*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,+b${KRB_LIB_DIR}" +- else +- RPATH="${RPATH}:${KRB_LIB_DIR}" +- fi +- ;; +- *-*-irix*) +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-rpath,${KRB_LIB_DIR}" +- else +- RPATH="${RPATH}:${KRB_LIB_DIR}" +- fi +- ;; +- *-*-solaris2*) +- if test "$ac_cv_prog_gcc" = yes; then +- if test "X$RPATH" = "X"; then +- RPATH="-Wl,-R${KRB_LIB_DIR}" +- else +- RPATH="${RPATH}:${KRB_LIB_DIR}" +- fi +- else +- RPATH="${RPATH} -R${KRB_LIB_DIR}" +- fi +- ;; +- esac +- AC_SUBST(RPATH) +- fi +- ]) +- +- +-dnl sasl2.m4--sasl2 libraries and includes +-dnl Rob Siemborski +-dnl $Id: sasl2.m4,v 1.48 2004/09/13 21:06:34 shadow Exp $ +- +-AC_DEFUN([SASL_GSSAPI_CHK],[ +- AC_ARG_ENABLE(gssapi, [ --enable-gssapi= enable GSSAPI authentication [yes] ], +- gssapi=$enableval, +- gssapi=yes) +- AC_ARG_WITH(gss_impl, [ --with-gss_impl={heimdal|mit|cybersafe|seam|auto} choose specific GSSAPI implementation [[auto]] ], +- gss_impl=$withval, +- gss_impl=auto) +- AC_REQUIRE([SASL2_CRYPT_CHK]) +- AC_REQUIRE([CMU_SOCKETS]) +- +- if test "$gssapi" != no; then +- platform= +- case "${host}" in +- *-*-linux*) +- platform=__linux +- ;; +- *-*-hpux*) +- platform=__hpux +- ;; +- *-*-irix*) +- platform=__irix +- ;; +- *-*-solaris2*) +-# When should we use __sunos? +- platform=__solaris +- ;; +- *-*-aix*) +- platform=__aix +- ;; +- *) +- AC_WARN([The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script]) +- if test "$gss_impl" = "cybersafe"; then +- AC_ERROR([CyberSafe was forced, cannot continue as platform is not supported]) +- fi +- ;; +- esac +- +- cmu_saved_CPPFLAGS=$CPPFLAGS +- +- if test -d ${gssapi}; then +- CPPFLAGS="$CPPFLAGS -I$gssapi/include" +-# We want to keep -I in our CPPFLAGS, but only if we succeed +- cmu_saved_CPPFLAGS=$CPPFLAGS +- LDFLAGS="$LDFLAGS -L$gssapi/lib" +- +- if test -n "$platform"; then +- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then +- CPPFLAGS="$CPPFLAGS -D$platform" +- if test -d "${gssapi}/appsec-sdk/include"; then +- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include" +- fi +- fi +- fi +- fi +- AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file]), [ +- AC_CHECK_HEADER(gssapi/gssapi.h,, AC_WARN(Disabling GSSAPI - no include files found); gssapi=no)]) +- +- CPPFLAGS=$cmu_saved_CPPFLAGS +- +- fi +- +- if test "$gssapi" != no; then +- dnl We need to find out which gssapi implementation we are +- dnl using. Supported alternatives are: MIT Kerberos 5, +- dnl Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal), +- dnl CyberSafe Kerberos 5 (http://www.cybersafe.com/) +- dnl and Sun SEAM (http://wwws.sun.com/software/security/kerberos/) +- dnl +- dnl The choice is reflected in GSSAPIBASE_LIBS +- +- AC_CHECK_LIB(resolv,res_search) +- if test -d ${gssapi}; then +- gssapi_dir="${gssapi}/lib" +- GSSAPIBASE_LIBS="-L$gssapi_dir" +- GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir" +- else +- dnl FIXME: This is only used for building cyrus, and then only as +- dnl a real hack. it needs to be fixed. +- gssapi_dir="/usr/local/lib" +- fi +- +- # Check a full link against the Heimdal libraries. +- # If this fails, check a full link against the MIT libraries. +- # If this fails, check a full link against the CyberSafe libraries. +- # If this fails, check a full link against the Solaris 8 and up libgss. +- +- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then +- gss_failed=0 +- AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET}) +- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then +- gss_impl="failed" +- fi +- fi +- +- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- gss_failed=0 +- AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET}) +- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then +- gss_impl="failed" +- fi +- fi +- +- # For Cybersafe one has to set a platform define in order to make compilation work +- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then +- +- cmu_saved_CPPFLAGS=$CPPFLAGS +- cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS +-# FIX ME - Note that the libraries are in .../lib/64 for 64bit kernels +- if test -d "${gssapi}/appsec-rt/lib"; then +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib" +- fi +- CPPFLAGS="$CPPFLAGS -D$platform" +- if test -d "${gssapi}/appsec-sdk/include"; then +- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include" +- fi +- +- gss_failed=0 +- +-# Check for CyberSafe with two libraries first, than fall back to a single +-# library (older CyberSafe) +- +- unset ac_cv_lib_gss_csf_gss_acq_user +- AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe03",[ +- unset ac_cv_lib_gss_csf_gss_acq_user;AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",gss_failed=1,$GSSAPIBASE_LIBS -lgss)],$GSSAPIBASE_LIBS -lgss -lcstbk5) +- +- if test "$gss_failed" = "1"; then +-# Restore variables +- GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS +- CPPFLAGS=$cmu_saved_CPPFLAGS +- +- if test "$gss_impl" != "auto"; then +- gss_impl="failed" +- fi +- fi +- fi +- +- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then +- gss_failed=0 +- AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",gss_failed=1,-lgss) +- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then +- gss_impl="failed" +- fi +- fi +- +- if test "$gss_impl" = "mit"; then +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" +- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a" +- elif test "$gss_impl" = "heimdal"; then +- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" +- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" +- elif test "$gss_impl" = "cybersafe03"; then +-# Version of CyberSafe with two libraries +- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include" +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5" +- # there is no static libgss for CyberSafe +- GSSAPIBASE_STATIC_LIBS=none +- elif test "$gss_impl" = "cybersafe"; then +- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include" +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss" +- # there is no static libgss for CyberSafe +- GSSAPIBASE_STATIC_LIBS=none +- elif test "$gss_impl" = "seam"; then +- GSSAPIBASE_LIBS=-lgss +- # there is no static libgss on Solaris 8 and up +- GSSAPIBASE_STATIC_LIBS=none +- elif test "$gss_impl" = "failed"; then +- gssapi="no" +- GSSAPIBASE_LIBS= +- GSSAPIBASE_STATIC_LIBS= +- AC_WARN(Disabling GSSAPI - specified library not found) +- else +- gssapi="no" +- GSSAPIBASE_LIBS= +- GSSAPIBASE_STATIC_LIBS= +- AC_WARN(Disabling GSSAPI - no library) +- fi +- fi +- +-# +-# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME in gssapi\rfckrb5.h +-# +- if test "$gssapi" != "no"; then +- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then +- AC_EGREP_CPP(hostbased_service_gss_nt_yes, +- [#include +- #ifdef GSS_C_NT_HOSTBASED_SERVICE +- hostbased_service_gss_nt_yes +- #endif +- ], AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,[Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE]), AC_WARN(Cybersafe define not found)) +- +- elif test "$ac_cv_header_gssapi_h" = "yes"; then +- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, +- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,[Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])) +- elif test "$ac_cv_header_gssapi_gssapi_h"; then +- +- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, +- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,[Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])) +- fi +- +- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then +- AC_EGREP_CPP(user_name_yes_gss_nt, +- [#include +- #ifdef GSS_C_NT_USER_NAME +- user_name_yes_gss_nt +- #endif +- ], AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,[Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME]), AC_WARN(Cybersafe define not found)) +- elif test "$ac_cv_header_gssapi_h" = "yes"; then +- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h, +- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,[Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])) +- elif test "$ac_cv_header_gssapi_gssapi_h"; then +- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h, +- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,[Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])) +- fi +- fi +- +- GSSAPI_LIBS="" +- AC_MSG_CHECKING(GSSAPI) +- if test "$gssapi" != no; then +- AC_MSG_RESULT(with implementation ${gss_impl}) +- AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv") +- SASL_MECHS="$SASL_MECHS libgssapiv2.la" +- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" +- +- cmu_save_LIBS="$LIBS" +- LIBS="$LIBS $GSSAPIBASE_LIBS" +- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) +- LIBS="$cmu_save_LIBS" +-else +- AC_MSG_RESULT(disabled) +-fi +-AC_SUBST(GSSAPI_LIBS) +-AC_SUBST(GSSAPIBASE_LIBS) +-]) +- +-AC_DEFUN([SASL_SET_GSSAPI_LIBS], [ +- SASL_GSSAPI_LIBS_SET="yes" +-]) +- +-dnl What we want to do here is setup LIB_SASL with what one would +-dnl generally want to have (e.g. if static is requested, make it that, +-dnl otherwise make it dynamic. +- +-dnl We also want to create LIB_DYN_SASL and DYNSASLFLAGS. +- +-dnl Also sets using_static_sasl to "no" "static" or "staticonly" +- +-AC_DEFUN([CMU_SASL2], [ +- AC_REQUIRE([SASL_GSSAPI_CHK]) +- +-AC_ARG_WITH(sasl, +- [ --with-sasl=DIR Compile with libsasl2 in ], +- with_sasl="$withval", +- with_sasl="yes") +- +-AC_ARG_WITH(staticsasl, +- [ --with-staticsasl=DIR Compile with staticly linked libsasl2 in ], +- with_staticsasl="$withval"; +- if test $with_staticsasl != "no"; then +- using_static_sasl="static" +- fi, +- with_staticsasl="no"; using_static_sasl="no") +- +- SASLFLAGS="" +- LIB_SASL="" +- +- cmu_saved_CPPFLAGS=$CPPFLAGS +- cmu_saved_LDFLAGS=$LDFLAGS +- cmu_saved_LIBS=$LIBS +- +- if test ${with_staticsasl} != "no"; then +- if test -d ${with_staticsasl}; then +- if test -d ${with_staticsasl}/lib64 ; then +- ac_cv_sasl_where_lib=${with_staticsasl}/lib64 +- else +- ac_cv_sasl_where_lib=${with_staticsasl}/lib +- fi +- ac_cv_sasl_where_lib=${with_staticsasl}/lib +- ac_cv_sasl_where_inc=${with_staticsasl}/include +- +- SASLFLAGS="-I$ac_cv_sasl_where_inc" +- LIB_SASL="-L$ac_cv_sasl_where_lib" +- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}" +- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}" +- else +- with_staticsasl="/usr" +- fi +- +- AC_CHECK_HEADER(sasl/sasl.h, [ +- AC_CHECK_HEADER(sasl/saslutil.h, [ +- for i42 in lib64 lib; do +- if test -r ${with_staticsasl}/$i42/libsasl2.a; then +- ac_cv_found_sasl=yes +- AC_MSG_CHECKING(for static libsasl) +- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a" +- fi +- done +- if test ! "$ac_cv_found_sasl" = "yes"; then +- AC_MSG_CHECKING(for static libsasl) +- AC_ERROR([Could not find ${with_staticsasl}/lib*/libsasl2.a]) +- fi +- ])]) +- +- AC_MSG_RESULT(found) +- +- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then +- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS" +- else +- SASL_GSSAPI_LIBS_SET="" +- cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" +- fi +- fi +- +- if test -d ${with_sasl}; then +- ac_cv_sasl_where_lib=${with_sasl}/lib +- ac_cv_sasl_where_inc=${with_sasl}/include +- +- DYNSASLFLAGS="-I$ac_cv_sasl_where_inc" +- if test "$ac_cv_sasl_where_lib" != ""; then +- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL) +- fi +- LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2" +- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}" +- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}" +- fi +- +- dnl be sure to check for a SASLv2 specific function +- AC_CHECK_HEADER(sasl/sasl.h, [ +- AC_CHECK_HEADER(sasl/saslutil.h, [ +- AC_CHECK_LIB(sasl2, prop_get, +- ac_cv_found_sasl=yes, +- ac_cv_found_sasl=no)], +- ac_cv_found_sasl=no)], ac_cv_found_sasl=no) +- +- if test "$ac_cv_found_sasl" = "yes"; then +- if test "$ac_cv_sasl_where_lib" != ""; then +- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL) +- fi +- DYNLIB_SASL="$DYNLIB_SASL -lsasl2" +- if test "$using_static_sasl" != "static"; then +- LIB_SASL=$DYNLIB_SASL +- SASLFLAGS=$DYNSASLFLAGS +- fi +- else +- DYNLIB_SASL="" +- DYNSASLFLAGS="" +- using_static_sasl="staticonly" +- fi +- +- if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then +- SASL_GSSAPI_LIBS_SET="" +- cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" +- fi +- +- LIBS="$cmu_saved_LIBS" +- LDFLAGS="$cmu_saved_LDFLAGS" +- CPPFLAGS="$cmu_saved_CPPFLAGS" +- +- AC_SUBST(LIB_DYN_SASL) +- AC_SUBST(DYNSASLFLAGS) +- AC_SUBST(LIB_SASL) +- AC_SUBST(SASLFLAGS) +- ]) +- +-AC_DEFUN([CMU_SASL2_REQUIRED], +-[AC_REQUIRE([CMU_SASL2]) +-if test "$ac_cv_found_sasl" != "yes"; then +- AC_ERROR([Cannot continue without libsasl2. +-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.]) +-fi]) +- +-AC_DEFUN([CMU_SASL2_REQUIRE_VER], [ +- AC_REQUIRE([CMU_SASL2_REQUIRED]) +- +- cmu_saved_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$CPPFLAGS $SASLFLAGS" +- +- AC_TRY_CPP([ +-#include +- +-#ifndef SASL_VERSION_MAJOR +-#error SASL_VERSION_MAJOR not defined +-#endif +-#ifndef SASL_VERSION_MINOR +-#error SASL_VERSION_MINOR not defined +-#endif +-#ifndef SASL_VERSION_STEP +-#error SASL_VERSION_STEP not defined +-#endif +- +-#if SASL_VERSION_MAJOR < $1 || SASL_VERSION_MINOR < $2 || SASL_VERSION_STEP < $3 +-#error SASL version is less than $1.$2.$3 +-#endif +- ],,AC_ERROR([Incorrect SASL headers found. This package requires SASL $1.$2.$3 or newer.])) +- +- CPPFLAGS=$cmu_saved_CPPFLAGS +-]) +- +-AC_DEFUN([CMU_SASL2_CHECKAPOP_REQUIRED], [ +- AC_REQUIRE([CMU_SASL2_REQUIRED]) +- +- cmu_saved_LDFLAGS=$LDFLAGS +- +- LDFLAGS="$LDFLAGS $LIB_SASL" +- +- AC_CHECK_LIB(sasl2, sasl_checkapop, AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?]), +- AC_MSG_ERROR([libsasl2 without working sasl_checkapop. Cannot continue.])) +- +- LDFLAGS=$cmu_saved_LDFLAGS +-]) +- +-AC_DEFUN([SASL2_CRYPT_CHK],[ +- AC_CHECK_FUNC(crypt, cmu_have_crypt=yes, [ +- AC_CHECK_LIB(crypt, crypt, +- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes, +- cmu_have_crypt=no)]) +- AC_SUBST(LIB_CRYPT) +-]) +- +-dnl libwrap.m4 --- do we have libwrap, the access control library? +-dnl $Id: libwrap.m4,v 1.9 2003/10/22 18:50:02 rjs3 Exp $ +- +-AC_DEFUN([CMU_LIBWRAP], [ +- AC_REQUIRE([CMU_SOCKETS]) +- AC_ARG_WITH(libwrap, +- [ --with-libwrap=DIR use libwrap (rooted in DIR) [yes] ], +- with_libwrap=$withval, with_libwrap=yes) +- if test "$with_libwrap" != no; then +- if test -d "$with_libwrap"; then +- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include" +- LDFLAGS="$LDFLAGS -L${with_libwrap}/lib" +- fi +- cmu_save_LIBS="$LIBS" +- AC_CHECK_LIB(wrap, request_init, [ +- AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)], +- with_libwrap=no, ${LIB_SOCKET}) +- LIBS="$cmu_save_LIBS" +- fi +- AC_MSG_CHECKING(libwrap support) +- AC_MSG_RESULT($with_libwrap) +- LIB_WRAP="" +- if test "$with_libwrap" != no; then +- AC_DEFINE(HAVE_LIBWRAP,[],[Do we have TCP wrappers?]) +- LIB_WRAP="-lwrap" +- AC_CHECK_LIB(nsl, yp_get_default_domain, LIB_WRAP="${LIB_WRAP} -lnsl") +- fi +- AC_SUBST(LIB_WRAP) +-]) +- +-dnl look for the (ucd|net)snmp libraries +-dnl $Id: ucdsnmp.m4,v 1.10 2004/05/24 19:25:41 ken3 Exp $ +- +-AC_DEFUN([CMU_UCDSNMP], [ +- AC_REQUIRE([CMU_SOCKETS]) +- AC_ARG_WITH(snmp, +- [ --with-snmp=DIR use ucd|net snmp (rooted in DIR) [yes] ], +- with_snmp=$withval, with_snmp=yes) +- +- dnl +- dnl Maintain backwards compatibility with old --with-ucdsnmp option +- dnl +- AC_ARG_WITH(ucdsnmp,, with_snmp=$withval,) +- +-if test "$with_snmp" != "no"; then +- +- dnl +- dnl Try net-snmp first +- dnl +- if test "$with_snmp" = "yes"; then +- AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,[/usr/local/bin:$PATH]) +- else +- SNMP_CONFIG="$with_snmp/bin/net-snmp-config" +- fi +- +- if test -x "$SNMP_CONFIG"; then +- AC_MSG_CHECKING(NET SNMP libraries) +- +- SNMP_LIBS=`$SNMP_CONFIG --agent-libs` +- SNMP_PREFIX=`$SNMP_CONFIG --prefix` +- +- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then +- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" +- LIB_UCDSNMP=$SNMP_LIBS +- AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?]) +- AC_SUBST(LIB_UCDSNMP) +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- AC_MSG_WARN([Could not find the required paths. Please check your net-snmp installation.]) +- fi +- else +- dnl +- dnl Try ucd-snmp if net-snmp test failed +- dnl +- if test "$with_snmp" != no; then +- if test -d "$with_snmp"; then +- CPPFLAGS="$CPPFLAGS -I${with_snmp}/include" +- LDFLAGS="$LDFLAGS -L${with_snmp}/lib" +- fi +- cmu_save_LIBS="$LIBS" +- AC_CHECK_LIB(snmp, sprint_objid, [ +- AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)], +- with_snmp=no, ${LIB_SOCKET}) +- LIBS="$cmu_save_LIBS" +- fi +- AC_MSG_CHECKING(UCD SNMP libraries) +- AC_MSG_RESULT($with_snmp) +- LIB_UCDSNMP="" +- if test "$with_snmp" != no; then +- AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) +- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" +- AC_CHECK_LIB(rpm, rpmdbOpen, +- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) +- fi +- AC_SUBST(LIB_UCDSNMP) +- fi +-fi +- +-]) +- ++m4_include([cmulocal/berkdb.m4]) ++m4_include([cmulocal/bsd_sockets.m4]) ++m4_include([cmulocal/c-attribute.m4]) ++m4_include([cmulocal/c-fpic.m4]) ++m4_include([cmulocal/cyrus.m4]) ++m4_include([cmulocal/ipv6.m4]) ++m4_include([cmulocal/libwrap.m4]) ++m4_include([cmulocal/sasl2.m4]) ++m4_include([cmulocal/ucdsnmp.m4]) +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__ +@@ -1216,7 +1223,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.12.orig/debian/patches/13-master_process_handling.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/03-fix_docs.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/51-multiple_mupdate_err.h-fix.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/51-multiple_mupdate_err.h-fix.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 51-multiple_mupdate_err.h-fix.dpatch by Ondřej Surý +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: mupdate_err.h is already included from mupdate.h + +@DPATCH@ +diff -urN cyrus22-imapd-2.2.12~/imap/mupdate-client.c cyrus22-imapd-2.2.12/imap/mupdate-client.c +--- cyrus22-imapd-2.2.12~/imap/mupdate-client.c 2004-08-25 17:35:41.000000000 +0200 ++++ cyrus22-imapd-2.2.12/imap/mupdate-client.c 2005-06-22 08:00:58.383544296 +0200 +@@ -73,7 +73,6 @@ + #include "imparse.h" + #include "iptostring.h" + #include "mupdate.h" +-#include "mupdate_err.h" + #include "prot.h" + #include "protocol.h" + #include "xmalloc.h" +diff -urN cyrus22-imapd-2.2.12~/imap/mupdate-slave.c cyrus22-imapd-2.2.12/imap/mupdate-slave.c +--- cyrus22-imapd-2.2.12~/imap/mupdate-slave.c 2004-03-08 20:23:04.000000000 +0100 ++++ cyrus22-imapd-2.2.12/imap/mupdate-slave.c 2005-06-22 08:00:52.971367072 +0200 +@@ -73,7 +73,6 @@ + #include "imparse.h" + #include "iptostring.h" + #include "mupdate.h" +-#include "mupdate_err.h" + #include "exitcodes.h" + + /* Returns file descriptor of kick socket (or does not return) */ --- cyrus-imapd-2.2-2.2.12.orig/debian/patches/12-fix_timeout_handling.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/14-xmalloc.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12.orig/debian/patches/98-use_Debian_config.guess_config.sub.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/98-use_Debian_config.guess_config.sub.dpatch @@ -0,0 +1,43 @@ +#!/bin/sh +## 98_use_Debian_config.guess_config.sub.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Update config.sub and config.guess from the autotools-dev package +set -e + +case "$1" in + "-patch") + if [ ! -f /usr/share/misc/config.sub ] || [ ! -f /usr/share/misc/config.guess ] ; then + echo "config.sub and/or config.guess not found - are autotools-dev really installed?" >&2 + exit 1 + fi + if [ -f config.guess ] && [ ! -f config.guess.dpatch ]; then + # only move it if the destination doesn't already exist. + # after all, our backup should really be the copy from + # the orig.tar.gz + mv config.guess config.guess.dpatch || exit 1 + fi + if [ -f config.sub ] && [ ! -f config.sub.dpatch ]; then + mv config.sub config.sub.dpatch || exit 1 + fi + cp -f /usr/share/misc/config.guess config.guess || exit 1 + cp -f /usr/share/misc/config.sub config.sub || exit 1 + exit 0 + ;; + "-unpatch") + if [ -f config.guess.dpatch ]; then + mv -f config.guess.dpatch config.guess || exit 1 + fi + if [ -f config.sub.dpatch ]; then + mv -f config.sub.dpatch config.sub || exit 1 + fi + exit 0 + ;; + *) + echo "unknown dpatch command: $1" >&2 + exit 1 + ;; +esac +exit 0 + + --- cyrus-imapd-2.2-2.2.12.orig/debian/patches/55-fix-db_err_callback.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/55-fix-db_err_callback.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 55-fix-db_err_callback.dpatch by Sven Mueller +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c /tmp/dpep.iwhsD7/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c +--- cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c 2005-03-12 23:09:22.000000000 +0100 ++++ /tmp/dpep.iwhsD7/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c 2006-01-14 19:39:43.150703236 +0100 +@@ -104,7 +104,11 @@ + exit(EC_TEMPFAIL); + } + ++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3 + static void db_err(const char *db_prfx, char *buffer) ++#else ++static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer) ++#endif + { + syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer); + } --- cyrus-imapd-2.2-2.2.12.orig/debian/patches/30-update_perlcalling.sh.dpatch +++ cyrus-imapd-2.2-2.2.12/debian/patches/30-update_perlcalling.sh.dpatch @@ -0,0 +1,494 @@ +#! /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.17 2004/11/19 17:05:48 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.9 2004/06/22 19:02:31 rjs3 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,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 to upgrade from versions of imapd previous to 1.6.2 + # make sure you run it as the cyrus user + # $Id: dohash,v 1.10 2001/02/23 04:43:01 leg 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,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 for mass compilation of sieve scripts. +-# +-# $Id: masssievec,v 1.4 2004/06/21 18:44:11 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; + + $| = 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.16 2004/06/29 18:16:54 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; + + $imapdconf = shift || "/etc/imapd.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.7 2003/10/22 18:50:32 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; + + $| = 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.7 2002/05/25 19:57:53 leg 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.12.orig/debian/patches/65-sieveshell-enhancements.dpatch +++ cyrus-imapd-2.2-2.2.12/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.12/perl/imap/IMAP/Shell.pm /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm +--- cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-12 16:03:50.000000000 +0100 ++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-12 16:06:24.305462117 +0100 +@@ -126,7 +126,7 @@ + [\&_sc_info, '[mailbox]', + 'display mailbox/server metadata'], + mboxcfg => +- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value', ++ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/] value', + 'configure mailbox'], + mboxconfig => 'mboxcfg', + reconstruct => +@@ -429,7 +429,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, +@@ -459,7 +459,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) { +@@ -1339,7 +1339,7 @@ + while (defined ($opt = shift(@argv))) { + last if $opt eq '--'; + if ($opt =~ /^-/) { +- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n"; ++ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n"; + } + else { + push(@nargv, $opt); +@@ -1348,7 +1348,7 @@ + } + push(@nargv, @argv); + if (@nargv < 2) { +- die "usage: mboxconfig mailbox [comment|news2mail|expire|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.12/perl/sieve/lib/request.c /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c +--- cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2006-01-12 16:03:50.000000000 +0100 ++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2006-01-12 16:06:24.305462117 +0100 +@@ -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.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl +--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2006-01-12 16:06:23.000000000 +0100 ++++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2006-01-12 16:06:24.306462019 +0100 +@@ -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