Changes - j0ke.net Open Build Service

@@ -0,0 +1,18 @@ +--- Makefile.in ++++ Makefile.in +@@ -50,11 +50,11 @@ + + install: all + @INSTALL@ -d ${DESTDIR}@sbindir@ +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 pound ${DESTDIR}@sbindir@/pound +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 poundctl ${DESTDIR}@sbindir@/poundctl ++ @INSTALL@ -m 555 pound ${DESTDIR}@sbindir@/pound ++ @INSTALL@ -m 755 poundctl ${DESTDIR}@sbindir@/poundctl + @INSTALL@ -d ${DESTDIR}@mandir@/man8 +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8 +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8 ++ @INSTALL@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8 ++ @INSTALL@ -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8 + + clean: + rm -f pound $(OBJS) poundctl poundctl.o

@@ -1,4 +1,165 @@ ------------------------------------------------------------------------ +r74 | roseg | 2011-12-28 14:57:45 +0100 (Wed, 28 Dec 2011) | 10 lines + +Release 2.6 + +Enhancements: + - allow multiple AddHeader directives + +Bug fixes: + - fixed memory leak in config/AddHeader + - removed call to AC_FUNC_MALLOC for AIX compatability + - workaround for AIX getaddrinfo() bug + +------------------------------------------------------------------------ +r73 | roseg | 2011-06-24 17:59:41 +0200 (Fri, 24 Jun 2011) | 7 lines + +Release 2.6f + +Enhancements: + +Bug fixes: + - fixed memory leak in DH (patch by Edvin Torok via Patrizio Tassone) + +------------------------------------------------------------------------ +r72 | roseg | 2011-04-25 11:10:45 +0200 (Mon, 25 Apr 2011) | 8 lines + +Release 2.6e + +Enhancements: + +Bug fixes: + - fixed problem in SNI certificate storage + - changed long to long long for support of requests larger than 2GB + +------------------------------------------------------------------------ +r71 | roseg | 2011-04-11 15:59:05 +0200 (Mon, 11 Apr 2011) | 9 lines + +Release 2.6d + +Enhancements: + - added parsing for certificate CN + +Bug fixes: + - fixed problem in task enqueing + - fixed small problem in Makefile + +------------------------------------------------------------------------ +r70 | roseg | 2010-12-27 17:54:18 +0100 (Mon, 27 Dec 2010) | 14 lines + +Release 2.6c + +Enhancements: + - added support for OpenSSL 1.0 + - added some more detailed error logging + +Bug fixes: + - fix for RewriteLocation + - fix for HTTPS back-ends + - fix for RPC support + - fix for possible request smuggling by using multiple headers + +Many thanks to Frank Schmirler and Ruben Kerkhof for the contributed patches + +------------------------------------------------------------------------ +r69 | roseg | 2010-09-25 16:49:49 +0200 (Sat, 25 Sep 2010) | 7 lines + +Release 2.6b + +Enhancements: + - pre-defined number of threads for better performance on small hardware + +Bug fixes: + +------------------------------------------------------------------------ +r68 | roseg | 2010-06-23 19:18:39 +0200 (Wed, 23 Jun 2010) | 15 lines + +Release 2.6a + +Stable release 2.5.1 + +Enhancements: + - support for SNI via multiple Cert directives (thanks to Joe Gooch) + - translate hexadecimal characters in URL for pattern matching + - added support for a "Disabled" directive in the configuration + +Bug fixes: + - keep sessions for disabled back-ends, continue using them until the time-out + - fixed memory leak in session removal + - user IgnoreCase for CheckURL too + - fixed some issues with OpenSolaris build (thanks to Spradling Cloyce) + +------------------------------------------------------------------------ +r67 | roseg | 2010-02-02 12:49:00 +0100 (Tue, 02 Feb 2010) | 9 lines + +Release 2.5 + +Enhancements: + +Bug fixes: + - fixed XML format to avoid problems with brain-dead parsers + - fixed Redirect to accept "/" as a path, so that "Redirect http://x/" is + considered an absolute path, but "Redirect http://x" is not + +------------------------------------------------------------------------ +r66 | roseg | 2010-01-04 17:20:55 +0100 (Mon, 04 Jan 2010) | 7 lines + +Release 2.5e + +Enhancements: + - added support for symbolic host names in poundctl + +Bug fixes: + +------------------------------------------------------------------------ +r65 | roseg | 2009-12-07 17:01:21 +0100 (Mon, 07 Dec 2009) | 9 lines + +Release 2.5d + +Enhancements: + - added support for --disable-pcreposix, --disable--tcmalloc, --disable-hoard in configuration script + +Bug fixes: + - fixed problem with long input lines in http.c + - if libpcreposix is present, then pcreposix.h must also be present + +------------------------------------------------------------------------ +r64 | roseg | 2009-09-21 13:16:57 +0200 (Mon, 21 Sep 2009) | 8 lines + +Release 2.5c + +Enhancements: + - added support for HTTPS backends + +Bug fixes: + - fixed problem with sub-patterns in session parameters + +------------------------------------------------------------------------ +r63 | roseg | 2009-08-19 17:44:07 +0200 (Wed, 19 Aug 2009) | 10 lines + +Release 2.5b + +Enhancements: + - support for ConnTO directive + - support for IgnoreCase directive + +Bug fixes: + - fixed problem in conf_fgets (\n confuses the regexp) + - changed RSA ephemeral keys regeneration default time (every 30 minutes) + +------------------------------------------------------------------------ +r62 | roseg | 2009-08-06 17:23:30 +0200 (Thu, 06 Aug 2009) | 9 lines + +Release 2.5a + +Enhancements: + - support for include directive + +Bug fixes: + - fixed generation of ephemeral RSA keys (avoid premature locking) + - added pre-generated DH parameters + +------------------------------------------------------------------------ r61 | roseg | 2009-06-29 17:53:55 +0200 (Mon, 29 Jun 2009) | 13 lines Release 2.4.5

@@ -24,11 +24,11 @@ No. Pound tries to be as transparent as possible - ideally a client should not be aware that there is anything between itself and the actual - Web server. A limited form of redirects are available - see the man page. + Web server. A limited form of redirect is available - see the man page. 1.5 Can I use Pound to deny certain requests? - Yes. Pound has quite a good mechanism for classifying requests and it + Yes. Pound has a rather good mechanism for classifying requests and it can deny/reject certain requests based on URL and/or header content. @@ -238,12 +238,9 @@ 4.9 Can Pound use HTTPS back-end servers? - No, that is not supported: such a connection would break a lot of things, - either security (Pound would effectively act as a man-in-the-middle, - breaking the end-to-end integrity of SSL) or functionality (if Pound - would just pass encrypted data back and forth things like session - tracking and validity checking would be impossible). This means that - such support is unlikely to ever be part of Pound. + Yes, but that is not always a very good idea. Such a setup would essentially + make Pound into a "man-in-the-middle" program. Even worse, the certificates + on the back-end would become meaningless - they are seen only by Pound. 5. Session tracking @@ -299,7 +296,7 @@ 6.5 Why does Pound not log anything when chrooted? On some systems you need access to /dev/log in order to use the syslog(8) - facility. Create the device as needed in the root jail you use. + facility. Create/link the device as needed in the root jail you use. 6.6 Why can't Pound log directly to a file?

@@ -1,5 +1,5 @@ # Pound - the reverse-proxy load-balancer -# Copyright (C) 2002-2007 Apsis GmbH +# Copyright (C) 2002-2010 Apsis GmbH # # This file is part of Pound. # @@ -8,7 +8,7 @@ # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# Foobar is distributed in the hope that it will be useful, +# Pound is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -21,7 +21,6 @@ # P.O.Box # 8707 Uetikon am See # Switzerland -# Tel: +41-44-920 4904 # EMail: roseg@apsis.ch CC=@PTHREAD_CC@ @@ -35,8 +34,8 @@ C_CERT1L="@C_CERT1L@" CFLAGS=-DF_CONF=\"$(F_CONF)\" -DVERSION=\"${VERSION}\" -DC_SSL=\"${C_SSL}\" -DC_T_RSA=\"${C_T_RSA}\" \ - -DC_MAXBUF=\"${C_MAXBUF}\" -DC_OWNER=\"${C_OWNER}\" -DC_GROUP=\"${C_GROUP}\" -DC_SUPER=\"${C_SUPER}\" \ - -DC_CERT1L=\"${C_CERT1L}\" @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@ + -DC_MAXBUF=\"${C_MAXBUF}\" -DC_OWNER=\"${C_OWNER}\" -DC_GROUP=\"${C_GROUP}\" \ + -DC_SUPER=\"${C_SUPER}\" -DC_CERT1L=\"${C_CERT1L}\" @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@ LIBS=@LIBS@ @PTHREAD_LIBS@ prefix=@prefix@ @@ -55,7 +54,16 @@ poundctl: poundctl.o ${CC} @LDFLAGS@ -o poundctl poundctl.o $(LIBS) -$(OBJS): pound.h +dh512.h: + openssl dhparam -5 -C -noout 512 > dh512.h + +dh1024.h: + openssl dhparam -5 -C -noout 1024 > dh1024.h + +$(OBJS) poundctl.o: pound.h config.h + +svc.o: svc.c dh512.h dh1024.h + ${CC} ${CFLAGS} -c -o svc.o svc.c install: all @INSTALL@ -d ${DESTDIR}@sbindir@ @@ -67,6 +75,7 @@ clean: rm -f pound $(OBJS) poundctl poundctl.o + rm -f dh512.h dh1024.h distclean: clean -rm -f config.h config.log config.status Makefile

@@ -347,6 +347,19 @@ as usual. Pound supports these certificates and you can use virtual hosts in the normal way. + Update June 2010: starting with the 2.6 series, Pound has SNI support, if your + OpenSSL version supports it. Basically you supply Pound with several certificates, + one for each virtual host (wild card certificates - as described above - are + allowed). On connecting the client signals to which server it wants to talk, + and Pound searches among its certificates which would fit. Not all versions + of OpenSSL and not all clients support this mode, but if available it allows + for virtual hosts over HTTPS. + + An additional option is to use a semi-official TLS extension, the so called + alternate subject name. If your version of OpenSSL supports it you may specify + in one certificate several alternate server names. This requires support for a + special TLS feature, and nor all clients accept it. + VIRTUAL HOSTS IN ZOPE

@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch */ @@ -78,7 +77,7 @@ static regex_t Service, ServiceName, URL, HeadRequire, HeadDeny, BackEnd, Emergency, Priority, HAport, HAportAddr; static regex_t Redirect, RedirectN, TimeOut, Session, Type, TTL, ID, DynScale; static regex_t ClientCert, AddHeader, Ciphers, CAlist, VerifyList, CRLlist, NoHTTPS11; -static regex_t Grace; +static regex_t Grace, Include, ConnTO, IgnoreCase, HTTPS, HTTPSCert, Disabled, Threads, CNName; static regmatch_t matches[5]; @@ -94,14 +93,85 @@ static int def_facility = LOG_DAEMON; static int clnt_to = 10; static int be_to = 15; -static int n_lin = 0; +static int be_connto = 15; static int dynscale = 0; +static int ignore_case = 0; + +#define MAX_FIN 8 + +static FILE *f_in[MAX_FIN]; +static char *f_name[MAX_FIN]; +static int n_lin[MAX_FIN]; +static int cur_fin; + +static int +conf_init(const char *name) +{ + if((f_name[0] = strdup(name)) == NULL) { + logmsg(LOG_ERR, "open %s: out of memory", name); + exit(1); + } + if((f_in[0] = fopen(name, "rt")) == NULL) { + logmsg(LOG_ERR, "can't open open %s", name); + exit(1); + } + n_lin[0] = 0; + cur_fin = 0; + return 0; +} + +void +conf_err(const char *msg) +{ + logmsg(LOG_ERR, "%s line %d: %s", f_name[cur_fin], n_lin[cur_fin], msg); + exit(1); +} + +static char * +conf_fgets(char *buf, const int max) +{ + int i; + + for(;;) { + if(fgets(buf, max, f_in[cur_fin]) == NULL) { + fclose(f_in[cur_fin]); + free(f_name[cur_fin]); + if(cur_fin > 0) { + cur_fin--; + continue; + } else + return NULL; + } + n_lin[cur_fin]++; + for(i = 0; i < max; i++) + if(buf[i] == '\n' || buf[i] == '\r') { + buf[i] = '\0'; + break; + } + if(!regexec(&Empty, buf, 4, matches, 0) || !regexec(&Comment, buf, 4, matches, 0)) + /* comment or empty line */ + continue; + if(!regexec(&Include, buf, 4, matches, 0)) { + buf[matches[1].rm_eo] = '\0'; + if(cur_fin == (MAX_FIN - 1)) + conf_err("Include nesting too deep"); + cur_fin++; + if((f_name[cur_fin] = strdup(&buf[matches[1].rm_so])) == NULL) + conf_err("Include out of memory"); + if((f_in[cur_fin] = fopen(&buf[matches[1].rm_so], "rt")) == NULL) + conf_err("can't open included file"); + n_lin[cur_fin] = 0; + continue; + } + return buf; + } +} /* * parse a back-end */ static BACKEND * -parse_be(FILE *const f_conf, const int is_emergency) +parse_be(const int is_emergency) { char lin[MAXBUF]; BACKEND *res; @@ -110,14 +180,13 @@ struct sockaddr_in in; struct sockaddr_in6 in6; - if((res = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: BackEnd config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) + conf_err("BackEnd config: out of memory - aborted"); memset(res, 0, sizeof(BACKEND)); res->be_type = 0; res->addr.ai_socktype = SOCK_STREAM; res->to = is_emergency? 120: be_to; + res->conn_to = is_emergency? 120: be_connto; res->alive = 1; memset(&res->addr, 0, sizeof(res->addr)); res->priority = 5; @@ -126,28 +195,20 @@ res->next = NULL; has_addr = has_port = 0; pthread_mutex_init(&res->mut, NULL); - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) || !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line */ - continue; - } else if(!regexec(&Address, lin, 4, matches, 0)) { + if(!regexec(&Address, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(get_host(lin + matches[1].rm_so, &res->addr)) { /* if we can't resolve it assume this is a UNIX domain socket */ res->addr.ai_socktype = SOCK_STREAM; res->addr.ai_family = AF_UNIX; res->addr.ai_protocol = 0; - if((res->addr.ai_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_un))) == NULL) { - logmsg(LOG_ERR, "line %d: out of memory", n_lin); - exit(1); - } - if((strlen(lin + matches[1].rm_so) + 1) > UNIX_PATH_MAX) { - logmsg(LOG_ERR, "line %d: UNIX path name too long (greater than %d)", n_lin, UNIX_PATH_MAX - 1); - exit(1); - } + if((res->addr.ai_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_un))) == NULL) + conf_err("out of memory"); + if((strlen(lin + matches[1].rm_so) + 1) > UNIX_PATH_MAX) + conf_err("UNIX path name too long"); res->addr.ai_addrlen = strlen(lin + matches[1].rm_so) + 1; res->addr.ai_addr->sa_family = AF_UNIX; strcpy(res->addr.ai_addr->sa_data, lin + matches[1].rm_so); @@ -167,28 +228,23 @@ memcpy(res->addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: Port is supported only for INET/INET6 back-ends", n_lin); - exit(1); + conf_err("Port is supported only for INET/INET6 back-ends"); } has_port = 1; } else if(!regexec(&Priority, lin, 4, matches, 0)) { - if(is_emergency) { - logmsg(LOG_ERR, "line %d: Priority is not supported for Emergency back-ends", n_lin); - exit(1); - } + if(is_emergency) + conf_err("Priority is not supported for Emergency back-ends"); res->priority = atoi(lin + matches[1].rm_so); } else if(!regexec(&TimeOut, lin, 4, matches, 0)) { res->to = atoi(lin + matches[1].rm_so); + } else if(!regexec(&ConnTO, lin, 4, matches, 0)) { + res->conn_to = atoi(lin + matches[1].rm_so); } else if(!regexec(&HAport, lin, 4, matches, 0)) { - if(is_emergency) { - logmsg(LOG_ERR, "line %d: HAport is not supported for Emergency back-ends", n_lin); - exit(1); - } + if(is_emergency) + conf_err("HAport is not supported for Emergency back-ends"); res->ha_addr = res->addr; - if((res->ha_addr.ai_addr = (struct sockaddr *)malloc(res->addr.ai_addrlen)) == NULL) { - logmsg(LOG_ERR, "line %d: out of memory", n_lin); - exit(1); - } + if((res->ha_addr.ai_addr = (struct sockaddr *)malloc(res->addr.ai_addrlen)) == NULL) + conf_err("out of memory"); memcpy(res->ha_addr.ai_addr, res->addr.ai_addr, res->addr.ai_addrlen); switch(res->addr.ai_family) { case AF_INET: @@ -202,24 +258,19 @@ memcpy(res->addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: HAport is supported only for INET/INET6 back-ends", n_lin); - exit(1); + conf_err("HAport is supported only for INET/INET6 back-ends"); } } else if(!regexec(&HAportAddr, lin, 4, matches, 0)) { - if(is_emergency) { - logmsg(LOG_ERR, "line %d: HAportAddr is not supported for Emergency back-ends", n_lin); - exit(1); - } + if(is_emergency) + conf_err("HAportAddr is not supported for Emergency back-ends"); lin[matches[1].rm_eo] = '\0'; if(get_host(lin + matches[1].rm_so, &res->ha_addr)) { /* if we can't resolve it assume this is a UNIX domain socket */ res->addr.ai_socktype = SOCK_STREAM; res->ha_addr.ai_family = AF_UNIX; res->ha_addr.ai_protocol = 0; - if((res->ha_addr.ai_addr = (struct sockaddr *)strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: out of memory", n_lin); - exit(1); - } + if((res->ha_addr.ai_addr = (struct sockaddr *)strdup(lin + matches[1].rm_so)) == NULL) + conf_err("out of memory"); res->addr.ai_addrlen = strlen(lin + matches[1].rm_so) + 1; } else switch(res->ha_addr.ai_family) { case AF_INET: @@ -233,27 +284,49 @@ memcpy(res->ha_addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: Unknown HA address type", n_lin); - exit(1); + conf_err("Unknown HA address type"); } + } else if(!regexec(&HTTPS, lin, 4, matches, 0)) { + if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL); + SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_options(res->ctx, SSL_OP_ALL); + sprintf(lin, "%d-Pound-%ld", getpid(), random()); + SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin)); + SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback); + SSL_CTX_set_tmp_dh_callback(res->ctx, DH_tmp_callback); + } else if(!regexec(&HTTPSCert, lin, 4, matches, 0)) { + if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + lin[matches[1].rm_eo] = '\0'; + if(SSL_CTX_use_certificate_chain_file(res->ctx, lin + matches[1].rm_so) != 1) + conf_err("SSL_CTX_use_certificate_chain_file failed - aborted"); + if(SSL_CTX_use_PrivateKey_file(res->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) + conf_err("SSL_CTX_use_PrivateKey_file failed - aborted"); + if(SSL_CTX_check_private_key(res->ctx) != 1) + conf_err("SSL_CTX_check_private_key failed - aborted"); + SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL); + SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_options(res->ctx, SSL_OP_ALL); + sprintf(lin, "%d-Pound-%ld", getpid(), random()); + SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin)); + SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback); + SSL_CTX_set_tmp_dh_callback(res->ctx, DH_tmp_callback); + } else if(!regexec(&Disabled, lin, 4, matches, 0)) { + res->disabled = atoi(lin + matches[1].rm_so); } else if(!regexec(&End, lin, 4, matches, 0)) { - if(!has_addr) { - logmsg(LOG_ERR, "line %d: BackEnd missing Address - aborted", n_lin); - exit(1); - } - if((res->addr.ai_family == AF_INET || res->addr.ai_family == AF_INET6) && !has_port) { - logmsg(LOG_ERR, "line %d: BackEnd missing Port - aborted", n_lin); - exit(1); - } + if(!has_addr) + conf_err("BackEnd missing Address - aborted"); + if((res->addr.ai_family == AF_INET || res->addr.ai_family == AF_INET6) && !has_port) + conf_err("BackEnd missing Port - aborted"); return res; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: BackEnd premature EOF", n_lin); - exit(1); + conf_err("BackEnd premature EOF"); return NULL; } @@ -261,22 +334,17 @@ * parse a session */ static void -parse_sess(FILE *const f_conf, SERVICE *const svc) +parse_sess(SERVICE *const svc) { - char lin[MAXBUF], *cp; + char lin[MAXBUF], *cp, *parm; - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + parm = NULL; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) || !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line */ - continue; - } else if(!regexec(&Type, lin, 4, matches, 0)) { - if(svc->sess_type != SESS_NONE) { - logmsg(LOG_ERR, "line %d: Multiple Session types in one Service - aborted", n_lin); - exit(1); - } + if(!regexec(&Type, lin, 4, matches, 0)) { + if(svc->sess_type != SESS_NONE) + conf_err("Multiple Session types in one Service - aborted"); lin[matches[1].rm_eo] = '\0'; cp = lin + matches[1].rm_so; if(!strcasecmp(cp, "IP")) @@ -291,76 +359,62 @@ svc->sess_type = SESS_BASIC; else if(!strcasecmp(cp, "HEADER")) svc->sess_type = SESS_HEADER; - else { - logmsg(LOG_ERR, "line %d: Unknown Session type \"%s\" - aborted", n_lin, cp); - exit(1); - } + else + conf_err("Unknown Session type"); } else if(!regexec(&TTL, lin, 4, matches, 0)) { svc->sess_ttl = atoi(lin + matches[1].rm_so); } else if(!regexec(&ID, lin, 4, matches, 0)) { - if(svc->sess_type != SESS_COOKIE && svc->sess_type != SESS_URL && svc->sess_type != SESS_HEADER) { - logmsg(LOG_ERR, "line %d: no ID permitted unless COOKIE/URL/HEADER Session - aborted", n_lin); - exit(1); - } + if(svc->sess_type != SESS_COOKIE && svc->sess_type != SESS_URL && svc->sess_type != SESS_HEADER) + conf_err("no ID permitted unless COOKIE/URL/HEADER Session - aborted"); lin[matches[1].rm_eo] = '\0'; - if((svc->sess_parm = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: ID config: out of memory - aborted", n_lin); - exit(1); - } + if((parm = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("ID config: out of memory - aborted"); } else if(!regexec(&End, lin, 4, matches, 0)) { - if(svc->sess_type == SESS_NONE) { - logmsg(LOG_ERR, "line %d: Session type not defined - aborted", n_lin); - exit(1); - } - if(svc->sess_ttl == 0) { - logmsg(LOG_ERR, "line %d: Session TTL not defined - aborted", n_lin); - exit(1); - } + if(svc->sess_type == SESS_NONE) + conf_err("Session type not defined - aborted"); + if(svc->sess_ttl == 0) + conf_err("Session TTL not defined - aborted"); if((svc->sess_type == SESS_COOKIE || svc->sess_type == SESS_URL || svc->sess_type == SESS_HEADER) - && svc->sess_parm == NULL) { - logmsg(LOG_ERR, "line %d: Session ID not defined - aborted", n_lin); - exit(1); - } + && parm == NULL) + conf_err("Session ID not defined - aborted"); if(svc->sess_type == SESS_COOKIE) { - snprintf(lin, MAXBUF - 1, "Cookie[^:]*:.*[ \t]%s=([^;]*)", svc->sess_parm); - if(regcomp(&svc->sess_pat, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: COOKIE pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + snprintf(lin, MAXBUF - 1, "Cookie[^:]*:.*[ \t]%s=", parm); + if(regcomp(&svc->sess_start, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("COOKIE pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^;]*)", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("COOKIE pattern failed - aborted"); } else if(svc->sess_type == SESS_URL) { - snprintf(lin, MAXBUF - 1, "[?&]%s=([^&;#]*)", svc->sess_parm); - if(regcomp(&svc->sess_pat, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: URL pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + snprintf(lin, MAXBUF - 1, "[?&]%s=", parm); + if(regcomp(&svc->sess_start, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("URL pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^&;#]*)", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("URL pattern failed - aborted"); } else if(svc->sess_type == SESS_PARM) { - snprintf(lin, MAXBUF - 1, ";([^?]*)"); - if(regcomp(&svc->sess_pat, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: PARM pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + if(regcomp(&svc->sess_start, ";", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("PARM pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^?]*)", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("PARM pattern failed - aborted"); } else if(svc->sess_type == SESS_BASIC) { - snprintf(lin, MAXBUF - 1, "Authorization:[ \t]*Basic[ \t]*([^ \t]*)[ \t]*"); - if(regcomp(&svc->sess_pat, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: BASIC pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + if(regcomp(&svc->sess_start, "Authorization:[ \t]*Basic[ \t]*", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("BASIC pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^ \t]*)", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("BASIC pattern failed - aborted"); } else if(svc->sess_type == SESS_HEADER) { - snprintf(lin, MAXBUF - 1, "%s:[ \t]*([^ \t]*)[ \t]*", svc->sess_parm); - if(regcomp(&svc->sess_pat, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HEADER pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + snprintf(lin, MAXBUF - 1, "%s:[ \t]*", parm); + if(regcomp(&svc->sess_start, lin, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("HEADER pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^ \t]*)", REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("HEADER pattern failed - aborted"); } + if(parm != NULL) + free(parm); return; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: Session premature EOF", n_lin); - exit(1); + conf_err("Session premature EOF"); return; } @@ -376,212 +430,187 @@ k = e->key; res = 2166136261; while(*k) - res = (res ^ *k++) * 16777619; + res = ((res ^ *k++) * 16777619) & 0xFFFFFFFF; return res; } -static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +static IMPLEMENT_LHASH_HASH_FN(t, TABNODE) +#else +static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *) +#endif + static int t_cmp(const TABNODE *d1, const TABNODE *d2) { return strcmp(d1->key, d2->key); } + +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +static IMPLEMENT_LHASH_COMP_FN(t, TABNODE) +#else static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *) +#endif + /* * parse a service */ static SERVICE * -parse_service(FILE *const f_conf, const char *svc_name) +parse_service(const char *svc_name) { char lin[MAXBUF]; SERVICE *res; BACKEND *be; MATCHER *m; + int ign_case; - if((res = (SERVICE *)malloc(sizeof(SERVICE))) == NULL) { - logmsg(LOG_ERR, "line %d: Service config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (SERVICE *)malloc(sizeof(SERVICE))) == NULL) + conf_err("Service config: out of memory - aborted"); memset(res, 0, sizeof(SERVICE)); res->sess_type = SESS_NONE; res->dynscale = dynscale; pthread_mutex_init(&res->mut, NULL); if(svc_name) strncpy(res->name, svc_name, KEY_SIZE); - if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) { - logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin); - exit(1); - } - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) +#else + if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) +#endif + conf_err("lh_new failed - aborted"); + ign_case = ignore_case; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) || !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line */ - continue; - } else if(!regexec(&URL, lin, 4, matches, 0)) { + if(!regexec(&URL, lin, 4, matches, 0)) { if(res->url) { for(m = res->url; m->next; m = m->next) ; - if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: URL config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("URL config: out of memory - aborted"); m = m->next; } else { - if((res->url = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: URL config: out of memory - aborted", n_lin); - exit(1); - } + if((res->url = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("URL config: out of memory - aborted"); m = res->url; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: URL bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_NEWLINE | REG_EXTENDED | (ign_case? REG_ICASE: 0))) + conf_err("URL bad pattern - aborted"); } else if(!regexec(&HeadRequire, lin, 4, matches, 0)) { if(res->req_head) { for(m = res->req_head; m->next; m = m->next) ; - if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRequire config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRequire config: out of memory - aborted"); m = m->next; } else { - if((res->req_head = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRequire config: out of memory - aborted", n_lin); - exit(1); - } + if((res->req_head = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRequire config: out of memory - aborted"); m = res->req_head; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadRequire bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("HeadRequire bad pattern - aborted"); } else if(!regexec(&HeadDeny, lin, 4, matches, 0)) { if(res->deny_head) { for(m = res->deny_head; m->next; m = m->next) ; - if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadDeny config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadDeny config: out of memory - aborted"); m = m->next; } else { - if((res->deny_head = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadDeny config: out of memory - aborted", n_lin); - exit(1); - } + if((res->deny_head = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadDeny config: out of memory - aborted"); m = res->deny_head; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadDeny bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("HeadDeny bad pattern - aborted"); } else if(!regexec(&Redirect, lin, 4, matches, 0)) { if(res->backends) { for(be = res->backends; be->next; be = be->next) ; - if((be->next = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((be->next = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = be->next; } else { - if((res->backends = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((res->backends = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = res->backends; } memset(be, 0, sizeof(BACKEND)); be->be_type = 302; be->priority = 1; be->alive = 1; - pthread_mutex_init(&res->mut, NULL); + pthread_mutex_init(& be->mut, NULL); lin[matches[1].rm_eo] = '\0'; - if((be->url = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: Redirector config: out of memory - aborted", n_lin); - exit(1); - } + if((be->url = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("Redirector config: out of memory - aborted"); /* split the URL into its fields */ - if(regexec(&LOCATION, be->url, 4, matches, 0)) { - logmsg(LOG_ERR, "line %d: Redirect bad URL \"%s\" - aborted", n_lin, be->url); - exit(1); - } - if(be->url[matches[3].rm_so] == '/') - matches[3].rm_so++; - /* if the path component is empty or a sigle slash */ - be->redir_req = ((matches[3].rm_eo - matches[3].rm_so) < 1); + if(regexec(&LOCATION, be->url, 4, matches, 0)) + conf_err("Redirect bad URL - aborted"); + if((be->redir_req = matches[3].rm_eo - matches[3].rm_so) == 1) + /* the path is a single '/', so remove it */ + be->url[matches[3].rm_so] = '\0'; } else if(!regexec(&RedirectN, lin, 4, matches, 0)) { if(res->backends) { for(be = res->backends; be->next; be = be->next) ; - if((be->next = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((be->next = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = be->next; } else { - if((res->backends = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((res->backends = (BACKEND *)malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = res->backends; } memset(be, 0, sizeof(BACKEND)); be->be_type = atoi(lin + matches[1].rm_so); be->priority = 1; be->alive = 1; - pthread_mutex_init(&res->mut, NULL); + pthread_mutex_init(& be->mut, NULL); lin[matches[2].rm_eo] = '\0'; - if((be->url = strdup(lin + matches[2].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: Redirector config: out of memory - aborted", n_lin); - exit(1); - } + if((be->url = strdup(lin + matches[2].rm_so)) == NULL) + conf_err("Redirector config: out of memory - aborted"); /* split the URL into its fields */ - if(regexec(&LOCATION, be->url, 4, matches, 0)) { - logmsg(LOG_ERR, "line %d: Redirect bad URL \"%s\" - aborted", n_lin, be->url); - exit(1); - } - if(be->url[matches[3].rm_so] == '/') - matches[3].rm_so++; - /* if the path component is empty or a sigle slash */ - be->redir_req = ((matches[3].rm_eo - matches[3].rm_so) < 1); + if(regexec(&LOCATION, be->url, 4, matches, 0)) + conf_err("Redirect bad URL - aborted"); + if((be->redir_req = matches[3].rm_eo - matches[3].rm_so) == 1) + /* the path is a single '/', so remove it */ + be->url[matches[3].rm_so] = '\0'; } else if(!regexec(&BackEnd, lin, 4, matches, 0)) { if(res->backends) { for(be = res->backends; be->next; be = be->next) ; - be->next = parse_be(f_conf, 0); + be->next = parse_be(0); } else - res->backends = parse_be(f_conf, 0); + res->backends = parse_be(0); } else if(!regexec(&Emergency, lin, 4, matches, 0)) { - res->emergency = parse_be(f_conf, 1); + res->emergency = parse_be(1); } else if(!regexec(&Session, lin, 4, matches, 0)) { - parse_sess(f_conf, res); + parse_sess(res); + } else if(!regexec(&DynScale, lin, 4, matches, 0)) { + res->dynscale = atoi(lin + matches[1].rm_so); + } else if(!regexec(&IgnoreCase, lin, 4, matches, 0)) { + ign_case = atoi(lin + matches[1].rm_so); + } else if(!regexec(&Disabled, lin, 4, matches, 0)) { + res->disabled = atoi(lin + matches[1].rm_so); } else if(!regexec(&End, lin, 4, matches, 0)) { for(be = res->backends; be; be = be->next) res->tot_pri += be->priority; res->abs_pri = res->tot_pri; return res; - } else if(!regexec(&DynScale, lin, 4, matches, 0)) { - res->dynscale = atoi(lin + matches[1].rm_so); } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: Service premature EOF", n_lin); - exit(1); + conf_err("Service premature EOF"); return NULL; } @@ -595,22 +624,14 @@ struct stat st; int fin; - if(stat(fname, &st)) { - logmsg(LOG_ERR, "line %d: can't stat Err file \"%s\" (%s) - aborted", n_lin, fname, strerror(errno)); - exit(1); - } - if((fin = open(fname, O_RDONLY)) < 0) { - logmsg(LOG_ERR, "line %d: can't open Err file \"%s\" (%s) - aborted", n_lin, fname, strerror(errno)); - exit(1); - } - if((res = malloc(st.st_size + 1)) == NULL) { - logmsg(LOG_ERR, "line %d: can't alloc Err file \"%s\" (out of memory) - aborted", n_lin, fname); - exit(1); - } - if(read(fin, res, st.st_size) != st.st_size) { - logmsg(LOG_ERR, "line %d: can't read Err file \"%s\" (%s) - aborted", n_lin, fname, strerror(errno)); - exit(1); - } + if(stat(fname, &st)) + conf_err("can't stat Err file - aborted"); + if((fin = open(fname, O_RDONLY)) < 0) + conf_err("can't open Err file - aborted"); + if((res = malloc(st.st_size + 1)) == NULL) + conf_err("can't alloc Err file (out of memory) - aborted"); + if(read(fin, res, st.st_size) != st.st_size) + conf_err("can't read Err file - aborted"); res[st.st_size] = '\0'; close(fin); return res; @@ -620,7 +641,7 @@ * parse an HTTP listener */ static LISTENER * -parse_HTTP(FILE *const f_conf) +parse_HTTP(void) { char lin[MAXBUF]; LISTENER *res; @@ -630,10 +651,8 @@ struct sockaddr_in in; struct sockaddr_in6 in6; - if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL) { - logmsg(LOG_ERR, "line %d: ListenHTTP config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL) + conf_err("ListenHTTP config: out of memory - aborted"); memset(res, 0, sizeof(LISTENER)); res->to = clnt_to; res->rewr_loc = 1; @@ -642,28 +661,18 @@ res->err501 = "This method may not be used."; res->err503 = "The service is not available. Please try again later."; res->log_level = log_level; - if(regcomp(&res->verb, xhttp[0], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad default pattern - aborted", n_lin); - exit(1); - } + if(regcomp(&res->verb, xhttp[0], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("xHTTP bad default pattern - aborted"); has_addr = has_port = 0; - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) || !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line */ - continue; - } else if(!regexec(&Address, lin, 4, matches, 0)) { + if(!regexec(&Address, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if(get_host(lin + matches[1].rm_so, &res->addr)) { - logmsg(LOG_ERR, "line %d: Unknown Listener address \"%s\"", n_lin, lin + matches[1].rm_so); - exit(1); - } - if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) { - logmsg(LOG_ERR, "line %d: Unknown Listener address family %d", n_lin, res->addr.ai_family); - exit(1); - } + if(get_host(lin + matches[1].rm_so, &res->addr)) + conf_err("Unknown Listener address"); + if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) + conf_err("Unknown Listener address family"); has_addr = 1; } else if(!regexec(&Port, lin, 4, matches, 0)) { switch(res->addr.ai_family) { @@ -678,8 +687,7 @@ memcpy(res->addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: Unknown Listener address family %d", n_lin, res->addr.ai_family); - exit(1); + conf_err("Unknown Listener address family"); } has_port = 1; } else if(!regexec(&xHTTP, lin, 4, matches, 0)) { @@ -687,22 +695,16 @@ n = atoi(lin + matches[1].rm_so); regfree(&res->verb); - if(regcomp(&res->verb, xhttp[n], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad pattern %d - aborted", n_lin, n); - exit(1); - } + if(regcomp(&res->verb, xhttp[n], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("xHTTP bad pattern - aborted"); } else if(!regexec(&Client, lin, 4, matches, 0)) { res->to = atoi(lin + matches[1].rm_so); } else if(!regexec(&CheckURL, lin, 4, matches, 0)) { - if(res->has_pat) { - logmsg(LOG_ERR, "line %d: CheckURL multiple pattern - aborted", n_lin); - exit(1); - } + if(res->has_pat) + conf_err("CheckURL multiple pattern - aborted"); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: CheckURL bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE | REG_EXTENDED | (ignore_case? REG_ICASE: 0))) + conf_err("CheckURL bad pattern - aborted"); res->has_pat = 1; } else if(!regexec(&Err414, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; @@ -717,34 +719,34 @@ lin[matches[1].rm_eo] = '\0'; res->err503 = file2str(lin + matches[1].rm_so); } else if(!regexec(&MaxRequest, lin, 4, matches, 0)) { - res->max_req = atol(lin + matches[1].rm_so); + res->max_req = ATOL(lin + matches[1].rm_so); } else if(!regexec(&HeadRemove, lin, 4, matches, 0)) { if(res->head_off) { for(m = res->head_off; m->next; m = m->next) ; - if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = m->next; } else { - if((res->head_off = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((res->head_off = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = res->head_off; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadRemove bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("HeadRemove bad pattern - aborted"); } else if(!regexec(&AddHeader, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: AddHeader config: out of memory - aborted", n_lin); - exit(1); + if(res->add_head == NULL) { + if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("AddHeader config: out of memory - aborted"); + } else { + if((res->add_head = realloc(res->add_head, strlen(res->add_head) + strlen(lin + matches[1].rm_so) + 3)) + == NULL) + conf_err("AddHeader config: out of memory - aborted"); + strcat(res->add_head, "\r\n"); + strcat(res->add_head, lin + matches[1].rm_so); } } else if(!regexec(&RewriteLocation, lin, 4, matches, 0)) { res->rewr_loc = atoi(lin + matches[1].rm_so); @@ -754,35 +756,31 @@ res->log_level = atoi(lin + matches[1].rm_so); } else if(!regexec(&Service, lin, 4, matches, 0)) { if(res->services == NULL) - res->services = parse_service(f_conf, NULL); + res->services = parse_service(NULL); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, NULL); + svc->next = parse_service(NULL); } } else if(!regexec(&ServiceName, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(res->services == NULL) - res->services = parse_service(f_conf, lin + matches[1].rm_so); + res->services = parse_service(lin + matches[1].rm_so); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, lin + matches[1].rm_so); + svc->next = parse_service(lin + matches[1].rm_so); } } else if(!regexec(&End, lin, 4, matches, 0)) { - if(!has_addr || !has_port) { - logmsg(LOG_ERR, "line %d: ListenHTTP missing Address or Port - aborted", n_lin); - exit(1); - } + if(!has_addr || !has_port) + conf_err("ListenHTTP missing Address or Port - aborted"); return res; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive - aborted"); } } - logmsg(LOG_ERR, "line %d: ListenHTTP premature EOF", n_lin); - exit(1); + conf_err("ListenHTTP premature EOF"); return NULL; } /* @@ -794,30 +792,51 @@ return 1; } +#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB +static int +SNI_server_name(SSL *ssl, int *dummy, POUND_CTX *ctx) +{ + const char *server_name; + POUND_CTX *pc; + + if((server_name = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name)) == NULL) + return SSL_TLSEXT_ERR_NOACK; + + /* logmsg(LOG_DEBUG, "Received SSL SNI Header for servername %s", servername); */ + + SSL_set_SSL_CTX(ssl, NULL); + for(pc = ctx; pc; pc = pc->next) + if(fnmatch(pc->server_name, server_name, 0) == 0) { + /* logmsg(LOG_DEBUG, "Found cert for %s", servername); */ + SSL_set_SSL_CTX(ssl, pc->ctx); + return SSL_TLSEXT_ERR_OK; + } + + /* logmsg(LOG_DEBUG, "No match for %s, default used", server_name); */ + SSL_set_SSL_CTX(ssl, ctx->ctx); + return SSL_TLSEXT_ERR_OK; +} +#endif + /* * parse an HTTPS listener */ static LISTENER * -parse_HTTPS(FILE *const f_conf) +parse_HTTPS(void) { char lin[MAXBUF]; LISTENER *res; SERVICE *svc; MATCHER *m; - int has_addr, has_port, has_cert; + int has_addr, has_port, has_other; struct hostent *host; struct sockaddr_in in; struct sockaddr_in6 in6; + POUND_CTX *pc; - if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL) { - logmsg(LOG_ERR, "line %d: ListenHTTPS config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL) + conf_err("ListenHTTPS config: out of memory - aborted"); memset(res, 0, sizeof(LISTENER)); - if((res->ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) { - logmsg(LOG_ERR, "line %d: SSL_CTX_new failed - aborted", n_lin); - exit(1); - } res->to = clnt_to; res->rewr_loc = 1; @@ -826,28 +845,18 @@ res->err501 = "This method may not be used."; res->err503 = "The service is not available. Please try again later."; res->log_level = log_level; - if(regcomp(&res->verb, xhttp[0], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad default pattern - aborted", n_lin); - exit(1); - } - has_addr = has_port = has_cert = 0; - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + if(regcomp(&res->verb, xhttp[0], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("xHTTP bad default pattern - aborted"); + has_addr = has_port = has_other = 0; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) || !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line */ - continue; - } else if(!regexec(&Address, lin, 4, matches, 0)) { + if(!regexec(&Address, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if(get_host(lin + matches[1].rm_so, &res->addr)) { - logmsg(LOG_ERR, "line %d: Unknown Listener address \"%s\"", n_lin, lin + matches[1].rm_so); - exit(1); - } - if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) { - logmsg(LOG_ERR, "line %d: Unknown Listener address family %d", n_lin, res->addr.ai_family); - exit(1); - } + if(get_host(lin + matches[1].rm_so, &res->addr)) + conf_err("Unknown Listener address"); + if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) + conf_err("Unknown Listener address family"); has_addr = 1; } else if(!regexec(&Port, lin, 4, matches, 0)) { if(res->addr.ai_family == AF_INET) { @@ -865,22 +874,16 @@ n = atoi(lin + matches[1].rm_so); regfree(&res->verb); - if(regcomp(&res->verb, xhttp[n], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad pattern %d - aborted", n_lin, n); - exit(1); - } + if(regcomp(&res->verb, xhttp[n], REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("xHTTP bad pattern - aborted"); } else if(!regexec(&Client, lin, 4, matches, 0)) { res->to = atoi(lin + matches[1].rm_so); } else if(!regexec(&CheckURL, lin, 4, matches, 0)) { - if(res->has_pat) { - logmsg(LOG_ERR, "line %d: CheckURL multiple pattern - aborted", n_lin); - exit(1); - } + if(res->has_pat) + conf_err("CheckURL multiple pattern - aborted"); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: CheckURL bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE | REG_EXTENDED | (ignore_case? REG_ICASE: 0))) + conf_err("CheckURL bad pattern - aborted"); res->has_pat = 1; } else if(!regexec(&Err414, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; @@ -895,29 +898,23 @@ lin[matches[1].rm_eo] = '\0'; res->err503 = file2str(lin + matches[1].rm_so); } else if(!regexec(&MaxRequest, lin, 4, matches, 0)) { - res->max_req = atol(lin + matches[1].rm_so); + res->max_req = ATOL(lin + matches[1].rm_so); } else if(!regexec(&HeadRemove, lin, 4, matches, 0)) { if(res->head_off) { for(m = res->head_off; m->next; m = m->next) ; - if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = m->next; } else { - if((res->head_off = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((res->head_off = (MATCHER *)malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = res->head_off; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadRemove bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE | REG_NEWLINE | REG_EXTENDED)) + conf_err("HeadRemove bad pattern - aborted"); } else if(!regexec(&RewriteLocation, lin, 4, matches, 0)) { res->rewr_loc = atoi(lin + matches[1].rm_so); } else if(!regexec(&RewriteDestination, lin, 4, matches, 0)) { @@ -925,138 +922,203 @@ } else if(!regexec(&LogLevel, lin, 4, matches, 0)) { res->log_level = atoi(lin + matches[1].rm_so); } else if(!regexec(&Cert, lin, 4, matches, 0)) { - lin[matches[1].rm_eo] = '\0'; - if(SSL_CTX_use_certificate_chain_file(res->ctx, lin + matches[1].rm_so) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_use_certificate_chain_file \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - if(SSL_CTX_use_PrivateKey_file(res->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_use_PrivateKey_file \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - if(SSL_CTX_check_private_key(res->ctx) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_check_private_key \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - has_cert = 1; +#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB + /* we have support for SNI */ + FILE *fcert; + char server_name[MAXBUF], *cp; + X509 *x509; + + if(has_other) + conf_err("Cert directives MUST precede other SSL-specific directives - aborted"); + if(res->ctx) { + for(pc = res->ctx; pc->next; pc = pc->next) + ; + if((pc->next = malloc(sizeof(POUND_CTX))) == NULL) + conf_err("ListenHTTPS new POUND_CTX: out of memory - aborted"); + pc = pc->next; + } else { + if((res->ctx = malloc(sizeof(POUND_CTX))) == NULL) + conf_err("ListenHTTPS new POUND_CTX: out of memory - aborted"); + pc = res->ctx; + } + if((pc->ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + pc->server_name = NULL; + pc->next = NULL; + lin[matches[1].rm_eo] = '\0'; + if(SSL_CTX_use_certificate_chain_file(pc->ctx, lin + matches[1].rm_so) != 1) + conf_err("SSL_CTX_use_certificate_chain_file failed - aborted"); + if(SSL_CTX_use_PrivateKey_file(pc->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) + conf_err("SSL_CTX_use_PrivateKey_file failed - aborted"); + if(SSL_CTX_check_private_key(pc->ctx) != 1) + conf_err("SSL_CTX_check_private_key failed - aborted"); + if((fcert = fopen(lin + matches[1].rm_so, "r")) == NULL) + conf_err("ListenHTTPS: could not open certificate file"); + if((x509 = PEM_read_X509(fcert, NULL, NULL, NULL)) == NULL) + conf_err("ListenHTTPS: could not get certificate subject"); + fclose(fcert); + memset(server_name, '\0', MAXBUF); + X509_NAME_oneline(X509_get_subject_name(x509), server_name, MAXBUF - 1); + X509_free(x509); + if(!regexec(&CNName, server_name, 4, matches, 0)) { + server_name[matches[1].rm_eo] = '\0'; + if((pc->server_name = strdup(server_name + matches[1].rm_so)) == NULL) + conf_err("ListenHTTPS: could not set certificate subject"); + } else + conf_err("ListenHTTPS: could not get certificate CN"); +#else + /* no SNI support */ + if(has_other) + conf_err("Cert directives MUST precede other SSL-specific directives - aborted"); + if(res->ctx) + conf_err("ListenHTTPS: multiple certificates not supported - aborted"); + if((res->ctx = malloc(sizeof(POUND_CTX))) == NULL) + conf_err("ListenHTTPS new POUND_CTX: out of memory - aborted"); + res->ctx->server_name = NULL; + res->ctx->next = NULL; + if((res->ctx->ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + lin[matches[1].rm_eo] = '\0'; + if(SSL_CTX_use_certificate_chain_file(res->ctx->ctx, lin + matches[1].rm_so) != 1) + conf_err("SSL_CTX_use_certificate_chain_file failed - aborted"); + if(SSL_CTX_use_PrivateKey_file(res->ctx->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) + conf_err("SSL_CTX_use_PrivateKey_file failed - aborted"); + if(SSL_CTX_check_private_key(res->ctx->ctx) != 1) + conf_err("SSL_CTX_check_private_key failed - aborted"); +#endif } else if(!regexec(&ClientCert, lin, 4, matches, 0)) { + has_other = 1; + if(res->ctx == NULL) + conf_err("ClientCert may only be used after Cert - aborted"); switch(res->clnt_check = atoi(lin + matches[1].rm_so)) { case 0: /* don't ask */ - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL); + for(pc = res->ctx; pc; pc = pc->next) + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_NONE, NULL); break; case 1: /* ask but OK if no client certificate */ - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, NULL); - SSL_CTX_set_verify_depth(res->ctx, atoi(lin + matches[2].rm_so)); + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, NULL); + SSL_CTX_set_verify_depth(pc->ctx, atoi(lin + matches[2].rm_so)); + } break; case 2: /* ask and fail if no client certificate */ - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); - SSL_CTX_set_verify_depth(res->ctx, atoi(lin + matches[2].rm_so)); + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); + SSL_CTX_set_verify_depth(pc->ctx, atoi(lin + matches[2].rm_so)); + } break; case 3: /* ask but do not verify client certificate */ - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, verify_OK); - SSL_CTX_set_verify_depth(res->ctx, atoi(lin + matches[2].rm_so)); + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, verify_OK); + SSL_CTX_set_verify_depth(pc->ctx, atoi(lin + matches[2].rm_so)); + } break; } } else if(!regexec(&AddHeader, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: AddHeader config: out of memory - aborted", n_lin); - exit(1); + if(res->add_head == NULL) { + if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("AddHeader config: out of memory - aborted"); + } else { + if((res->add_head = realloc(res->add_head, strlen(res->add_head) + strlen(lin + matches[1].rm_so) + 3)) == NULL) + conf_err("AddHeader config: out of memory - aborted"); + strcat(res->add_head, "\r\n"); + strcat(res->add_head, lin + matches[1].rm_so); } } else if(!regexec(&Ciphers, lin, 4, matches, 0)) { + has_other = 1; + if(res->ctx == NULL) + conf_err("Ciphers may only be used after Cert - aborted"); lin[matches[1].rm_eo] = '\0'; - SSL_CTX_set_cipher_list(res->ctx, lin + matches[1].rm_so); + for(pc = res->ctx; pc; pc = pc->next) + SSL_CTX_set_cipher_list(pc->ctx, lin + matches[1].rm_so); } else if(!regexec(&CAlist, lin, 4, matches, 0)) { STACK_OF(X509_NAME) *cert_names; - lin[matches[1].rm_eo] = '\0'; - if((cert_names = SSL_load_client_CA_file(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: SSL_load_client_CA_file \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - SSL_CTX_set_client_CA_list(res->ctx, cert_names); + has_other = 1; + if(res->ctx == NULL) + conf_err("CAList may only be used after Cert - aborted"); + lin[matches[1].rm_eo] = '\0'; + if((cert_names = SSL_load_client_CA_file(lin + matches[1].rm_so)) == NULL) + conf_err("SSL_load_client_CA_file failed - aborted"); + for(pc = res->ctx; pc; pc = pc->next) + SSL_CTX_set_client_CA_list(pc->ctx, cert_names); } else if(!regexec(&VerifyList, lin, 4, matches, 0)) { - lin[matches[1].rm_eo] = '\0'; - if(SSL_CTX_load_verify_locations(res->ctx, lin + matches[1].rm_so, NULL) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_load_verify_locations \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } + has_other = 1; + if(res->ctx == NULL) + conf_err("VerifyList may only be used after Cert - aborted"); + lin[matches[1].rm_eo] = '\0'; + for(pc = res->ctx; pc; pc = pc->next) + if(SSL_CTX_load_verify_locations(pc->ctx, lin + matches[1].rm_so, NULL) != 1) + conf_err("SSL_CTX_load_verify_locations failed - aborted"); } else if(!regexec(&CRLlist, lin, 4, matches, 0)) { #if HAVE_X509_STORE_SET_FLAGS X509_STORE *store; X509_LOOKUP *lookup; - lin[matches[1].rm_eo] = '\0'; - store = SSL_CTX_get_cert_store(res->ctx); - if((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file())) == NULL) { - logmsg(LOG_ERR, "line %d: X509_STORE_add_lookup \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - if(X509_load_crl_file(lookup, lin + matches[1].rm_so, X509_FILETYPE_PEM) != 1) { - logmsg(LOG_ERR, "line %d: X509_load_crl_file \"%s\" failed - aborted", n_lin, lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); + has_other = 1; + if(res->ctx == NULL) + conf_err("CRLlist may only be used after Cert - aborted"); + lin[matches[1].rm_eo] = '\0'; + for(pc = res->ctx; pc; pc = pc->next) { + store = SSL_CTX_get_cert_store(pc->ctx); + if((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file())) == NULL) + conf_err("X509_STORE_add_lookup failed - aborted"); + if(X509_load_crl_file(lookup, lin + matches[1].rm_so, X509_FILETYPE_PEM) != 1) + conf_err("X509_load_crl_file failed - aborted"); + X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL); } - X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL); #else - logmsg(LOG_ERR, "line %d: your version of OpenSSL does not support CRL checking", n_lin); + conf_err("your version of OpenSSL does not support CRL checking"); #endif } else if(!regexec(&NoHTTPS11, lin, 4, matches, 0)) { res->noHTTPS11 = atoi(lin + matches[1].rm_so); } else if(!regexec(&Service, lin, 4, matches, 0)) { if(res->services == NULL) - res->services = parse_service(f_conf, NULL); + res->services = parse_service(NULL); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, NULL); + svc->next = parse_service(NULL); } } else if(!regexec(&ServiceName, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(res->services == NULL) - res->services = parse_service(f_conf, lin + matches[1].rm_so); + res->services = parse_service(lin + matches[1].rm_so); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, lin + matches[1].rm_so); + svc->next = parse_service(lin + matches[1].rm_so); } } else if(!regexec(&End, lin, 4, matches, 0)) { X509_STORE *store; - if(!has_addr || !has_port || !has_cert) { - logmsg(LOG_ERR, "line %d: ListenHTTPS missing Address, Port or Certificate - aborted", n_lin); - exit(1); + if(!has_addr || !has_port || res->ctx == NULL) + conf_err("ListenHTTPS missing Address, Port or Certificate - aborted"); +#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB + if(!SSL_CTX_set_tlsext_servername_callback(res->ctx->ctx, SNI_server_name) + || !SSL_CTX_set_tlsext_servername_arg(res->ctx->ctx, res->ctx)) + conf_err("ListenHTTPS: can't set SNI callback"); +#endif + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_mode(pc->ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_options(pc->ctx, SSL_OP_ALL); + sprintf(lin, "%d-Pound-%ld", getpid(), random()); + SSL_CTX_set_session_id_context(pc->ctx, (unsigned char *)lin, strlen(lin)); + SSL_CTX_set_tmp_rsa_callback(pc->ctx, RSA_tmp_callback); + SSL_CTX_set_tmp_dh_callback(pc->ctx, DH_tmp_callback); } - SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_options(res->ctx, SSL_OP_ALL); - sprintf(lin, "%d-Pound-%ld", getpid(), random()); - SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin)); - SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback); return res; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: ListenHTTPS premature EOF", n_lin); - exit(1); + conf_err("ListenHTTPS premature EOF"); return NULL; } @@ -1064,7 +1126,7 @@ * parse the config file */ static void -parse_file(FILE *const f_conf) +parse_file(void) { char lin[MAXBUF]; SERVICE *svc; @@ -1074,33 +1136,25 @@ ENGINE *e; #endif - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) || !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line */ - continue; - } else if(!regexec(&User, lin, 4, matches, 0)) { + if(!regexec(&User, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((user = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: User config: out of memory - aborted", n_lin); - exit(1); - } + if((user = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("User config: out of memory - aborted"); } else if(!regexec(&Group, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((group = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: Group config: out of memory - aborted", n_lin); - exit(1); - } + if((group = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("Group config: out of memory - aborted"); } else if(!regexec(&RootJail, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((root_jail = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: RootJail config: out of memory - aborted", n_lin); - exit(1); - } + if((root_jail = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("RootJail config: out of memory - aborted"); } else if(!regexec(&Daemon, lin, 4, matches, 0)) { daemonize = atoi(lin + matches[1].rm_so); + } else if(!regexec(&Threads, lin, 4, matches, 0)) { + numthreads = atoi(lin + matches[1].rm_so); } else if(!regexec(&LogFacility, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(lin[matches[1].rm_so] == '-') @@ -1123,72 +1177,69 @@ dynscale = atoi(lin + matches[1].rm_so); } else if(!regexec(&TimeOut, lin, 4, matches, 0)) { be_to = atoi(lin + matches[1].rm_so); + } else if(!regexec(&ConnTO, lin, 4, matches, 0)) { + be_connto = atoi(lin + matches[1].rm_so); + } else if(!regexec(&IgnoreCase, lin, 4, matches, 0)) { + ignore_case = atoi(lin + matches[1].rm_so); #if HAVE_OPENSSL_ENGINE_H } else if(!regexec(&SSLEngine, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; #if OPENSSL_VERSION_NUMBER >= 0x00907000L ENGINE_load_builtin_engines(); #endif - if (!(e = ENGINE_by_id(lin + matches[1].rm_so))) { - logmsg(LOG_ERR, "line %d: could not find %s engine", n_lin, lin + matches[1].rm_so); - exit(1); - } + if (!(e = ENGINE_by_id(lin + matches[1].rm_so))) + conf_err("could not find engine"); if(!ENGINE_init(e)) { ENGINE_free(e); - logmsg(LOG_ERR, "line %d: could not init %s engine", n_lin, lin + matches[1].rm_so); - exit(1); + conf_err("could not init engine"); } if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { ENGINE_free(e); - logmsg(LOG_ERR, "line %d: could not set all defaults", n_lin); - exit(1); + conf_err("could not set all defaults"); } ENGINE_finish(e); ENGINE_free(e); #endif } else if(!regexec(&Control, lin, 4, matches, 0)) { - if(ctrl_name != NULL) { - logmsg(LOG_ERR, "line %d: Control multiply defined - aborted", n_lin); - exit(1); - } + if(ctrl_name != NULL) + conf_err("Control multiply defined - aborted"); lin[matches[1].rm_eo] = '\0'; ctrl_name = strdup(lin + matches[1].rm_so); } else if(!regexec(&ListenHTTP, lin, 4, matches, 0)) { if(listeners == NULL) - listeners = parse_HTTP(f_conf); + listeners = parse_HTTP(); else { for(lstn = listeners; lstn->next; lstn = lstn->next) ; - lstn->next = parse_HTTP(f_conf); + lstn->next = parse_HTTP(); } } else if(!regexec(&ListenHTTPS, lin, 4, matches, 0)) { if(listeners == NULL) - listeners = parse_HTTPS(f_conf); + listeners = parse_HTTPS(); else { for(lstn = listeners; lstn->next; lstn = lstn->next) ; - lstn->next = parse_HTTPS(f_conf); + lstn->next = parse_HTTPS(); } } else if(!regexec(&Service, lin, 4, matches, 0)) { if(services == NULL) - services = parse_service(f_conf, NULL); + services = parse_service(NULL); else { for(svc = services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, NULL); + svc->next = parse_service(NULL); } } else if(!regexec(&ServiceName, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(services == NULL) - services = parse_service(f_conf, lin + matches[1].rm_so); + services = parse_service(lin + matches[1].rm_so); else { for(svc = services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, lin + matches[1].rm_so); + svc->next = parse_service(lin + matches[1].rm_so); } } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive - aborted"); } } return; @@ -1210,6 +1261,7 @@ || regcomp(&Group, "^[ \t]*Group[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&RootJail, "^[ \t]*RootJail[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&Daemon, "^[ \t]*Daemon[ \t]+([01])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&Threads, "^[ \t]*Threads[ \t]+([1-9][0-9]*)[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&LogFacility, "^[ \t]*LogFacility[ \t]+([a-z0-9-]+)[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&LogLevel, "^[ \t]*LogLevel[ \t]+([0-5])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&Grace, "^[ \t]*Grace[ \t]+([0-9]+)[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) @@ -1258,6 +1310,13 @@ || regcomp(&VerifyList, "^[ \t]*VerifyList[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&CRLlist, "^[ \t]*CRLlist[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&NoHTTPS11, "^[ \t]*NoHTTPS11[ \t]+([0-2])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&Include, "^[ \t]*Include[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&ConnTO, "^[ \t]*ConnTO[ \t]+([1-9][0-9]*)[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&IgnoreCase, "^[ \t]*IgnoreCase[ \t]+([01])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&HTTPS, "^[ \t]*HTTPS[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&HTTPSCert, "^[ \t]*HTTPS[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&Disabled, "^[ \t]*Disabled[ \t]+[01][ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&CNName, ".*[Cc][Nn]=([-*.A-Za-z0-9]+).*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) ) { logmsg(LOG_ERR, "bad config Regex - aborted"); exit(1); @@ -1327,16 +1386,14 @@ exit(1); } - if((f_conf = fopen(conf_name, "rt")) == NULL) { - logmsg(LOG_ERR, "can't open configuration file \"%s\" (%s) - aborted", conf_name, strerror(errno)); - exit(1); - } + conf_init(conf_name); user = NULL; group = NULL; root_jail = NULL; ctrl_name = NULL; + numthreads = 128; alive_to = 30; daemonize = 1; grace = 30; @@ -1344,9 +1401,7 @@ services = NULL; listeners = NULL; - parse_file(f_conf); - - fclose(f_conf); + parse_file(); if(check_only) { logmsg(LOG_INFO, "Config file %s is OK", conf_name); @@ -1364,6 +1419,7 @@ regfree(&Group); regfree(&RootJail); regfree(&Daemon); + regfree(&Threads); regfree(&LogFacility); regfree(&LogLevel); regfree(&Grace); @@ -1412,6 +1468,13 @@ regfree(&VerifyList); regfree(&CRLlist); regfree(&NoHTTPS11); + regfree(&Include); + regfree(&ConnTO); + regfree(&IgnoreCase); + regfree(&HTTPS); + regfree(&HTTPSCert); + regfree(&Disabled); + regfree(&CNName); /* set the facility only here to ensure the syslog gets opened if necessary */ log_facility = def_facility;

@@ -12,6 +12,9 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the `long long' type. */ +#undef HAVE_LONG_LONG_INT + /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -36,13 +39,12 @@ /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL +/* Define if libpcreposix is available */ +#undef HAVE_LIBPCREPOSIX + /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -229,6 +231,9 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME +/* Define to 1 if you have the <fnmatch.h> header file. */ +#undef HAVE_FNMATCH_H + /* Define to empty if `const' does not conform to ANSI C. */ #undef const

@@ -1,62 +1,85 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pound 2.4.5. +# Generated by GNU Autoconf 2.65 for pound 2.6. # # Report bugs to <roseg@apsis.ch>. # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\$.*\$"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\$.*\$$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; + esac; + expr "X$arg" : "X\$.*\$" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -65,20 +88,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -89,354 +110,322 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '$a$' >/dev/null 2>&1 && - test "X`expr 00001 : '.*$...$'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ - X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/$[^/][^/]*$\/*$/{ - s//\1/ - q - } - /^X\/$\/\/$$/{ - s//\1/ - q - } - /^X\/$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and roseg@apsis.ch +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi -if ( set x; as_func_ret_success y && test x = "$1" ); then - : +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ + X"$0" : 'X$//$$' \| \ + X"$0" : 'X$/$' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/$[^/][^/]*$\/*$/{ + s//\1/ + q + } + /^X\/$\/\/$$/{ + s//\1/ + q + } + /^X\/$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -453,8 +442,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -464,49 +452,40 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '$a$' >/dev/null 2>&1 && - test "X`expr 00001 : '.*$...$'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -514,7 +493,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -531,12 +510,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -550,8 +529,8 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 </dev/null 6>&1 +test -n "$DJDIR" || exec 7<&0 </dev/null +exec 6>&1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -569,14 +548,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pound' PACKAGE_TARNAME='pound' -PACKAGE_VERSION='2.4.5' -PACKAGE_STRING='pound 2.4.5' +PACKAGE_VERSION='2.6' +PACKAGE_STRING='pound 2.6' PACKAGE_BUGREPORT='roseg@apsis.ch' +PACKAGE_URL='' ac_unique_file="pound.c" # Factoring default headers for most tests. @@ -594,105 +573,119 @@ #else # ifdef HAVE_STDLIB_H # include <stdlib.h> -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include <memory.h> -# endif -# include <string.h> -#endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -#endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif" - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -acx_pthread_config -PTHREAD_CC -PTHREAD_LIBS -PTHREAD_CFLAGS -C_SSL -C_T_RSA -C_MAXBUF -C_OWNER -C_GROUP -C_SUPER -C_CERT1L -CPP -GREP -EGREP -LIBOBJS -I_OWNER +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include <memory.h> +# endif +# include <string.h> +#endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#endif +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif" + +ac_subst_vars='LTLIBOBJS I_GRP -LTLIBOBJS' +I_OWNER +LIBOBJS +EGREP +GREP +CPP +C_CERT1L +C_SUPER +C_GROUP +C_OWNER +C_MAXBUF +C_T_RSA +C_SSL +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +acx_pthread_config +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_ssl +with_t_rsa +with_maxbuf +with_owner +with_group +enable_super +enable_cert1l +enable_pcreposix +enable_tcmalloc +enable_hoard +' ac_precious_vars='build_alias host_alias target_alias @@ -707,6 +700,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -805,13 +800,20 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -824,13 +826,20 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1021,22 +1030,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'` + ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-$.*$'` + ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1056,25 +1079,25 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1083,23 +1106,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1113,7 +1149,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1129,23 +1165,21 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$0" : 'X$//$[^/]' \| \ - X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X$//$[^/]' \| \ + X"$as_myself" : 'X$//$$' \| \ + X"$as_myself" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1172,13 +1206,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1204,7 +1236,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pound 2.4.5 to adapt to many kinds of systems. +\`configure' configures pound 2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1226,9 +1258,9 @@ 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 @@ -1238,25 +1270,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/pound] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/pound] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1270,17 +1302,24 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pound 2.4.5:";; + short | recursive ) echo "Configuration of pound 2.6:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-super enable or disable running with supervisor process (default: enabled) --enable-cert1l enable or disable single-line certificate (default: disabled) + --enable-pcreposix enable or disable using the pcreposix library + (default: enabled if available) + --enable-tcmalloc enable or disable using the tcmalloc library + (default: enabled if available) + --enable-hoard enable or disable using the hoard library (default: + enabled if available and tcmalloc NOT available) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1298,90 +1337,503 @@ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> LIBS libraries to pass to the linker, e.g. -l<library> - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to <roseg@apsis.ch>. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +pound configure 2.6 +generated by GNU Autoconf 2.65 + +Copyright (C) 2009 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ----------------------------- ## +## Report this to roseg@apsis.ch ## +## ----------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel -Report bugs to <roseg@apsis.ch>. +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF -ac_status=$? +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +} # ac_fn_c_check_header_compile -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case <limits.h> declares $2. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $2 innocuous_$2 -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -pound configure 2.4.5 -generated by GNU Autoconf 2.61 +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF - exit +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pound $as_me 2.4.5, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by pound $as_me 2.6, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1417,8 +1869,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1452,12 +1904,12 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1473,13 +1925,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1504,12 +1956,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1538,9 +1991,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1555,9 +2008,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1573,83 +2026,88 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1663,68 +2121,56 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1746,10 +2192,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1759,25 +2205,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1786,10 +2232,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1799,25 +2245,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -1825,12 +2271,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -1843,10 +2285,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1856,25 +2298,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1883,10 +2325,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1897,18 +2339,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -1927,11 +2369,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1942,10 +2384,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1955,25 +2397,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1986,10 +2428,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1999,25 +2441,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2029,12 +2471,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2044,51 +2482,37 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2100,42 +2524,38 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2145,14 +2565,14 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` fi @@ -2171,78 +2591,42 @@ else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2250,37 +2634,90 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2292,51 +2729,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2350,54 +2782,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2408,34 +2820,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2446,35 +2835,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2485,42 +2851,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2536,18 +2878,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> @@ -2604,31 +2942,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -2639,17 +2955,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2659,24 +2977,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2701,22 +3011,23 @@ # 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; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2734,17 +3045,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -2757,8 +3080,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2770,35 +3093,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2814,28 +3129,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2851,28 +3162,24 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if test "${ac_cv_target+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2905,7 +3212,7 @@ # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# Foobar is distributed in the hope that it will be useful, +# Pound is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -2925,11 +3232,11 @@ if test "${CC}" = "gcc" then - CPPFLAGS="${CPPFLAGS} -Wstrict-prototypes -pipe" + CPPFLAGS="${CPPFLAGS} -Wstrict-prototypes -Wno-unused-result -pipe" fi -{ echo "$as_me:$LINENO: *** Checking for threads library and/or flags ***" >&5 -echo "$as_me: *** Checking for threads library and/or flags ***" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Checking for threads library and/or flags ***" >&5 +$as_echo "$as_me: *** Checking for threads library and/or flags ***" >&6;} @@ -2956,13 +3263,9 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -2980,36 +3283,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } if test x"$acx_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -3069,23 +3349,23 @@ case $flag in none) - { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 -echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } ;; -*) - { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 -echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$acx_pthread_config"; then ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. @@ -3095,14 +3375,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_acx_pthread_config="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" @@ -3110,11 +3390,11 @@ fi acx_pthread_config=$ac_cv_prog_acx_pthread_config if test -n "$acx_pthread_config"; then - { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5 -echo "${ECHO_T}$acx_pthread_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 +$as_echo "$acx_pthread_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3124,8 +3404,8 @@ ;; *) - { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 -echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } PTHREAD_LIBS="-l$flag" ;; esac @@ -3144,11 +3424,7 @@ # pthread_cleanup_push because it is one of the few pthread # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -3161,40 +3437,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } if test "x$acx_pthread_ok" = xyes; then break; fi @@ -3213,13 +3466,9 @@ # Detect AIX lossage: threads are created detached by default # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 -echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -3230,40 +3479,15 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ok=PTHREAD_CREATE_JOINABLE else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ok=unknown + ok=unknown fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xunknown; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -3274,58 +3498,35 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ok=PTHREAD_CREATE_UNDETACHED else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ok=unknown + ok=unknown fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then -cat >>confdefs.h <<\_ACEOF -#define PTHREAD_CREATE_JOINABLE $ok -_ACEOF +$as_echo "#define PTHREAD_CREATE_JOINABLE \$ok" >>confdefs.h fi - { echo "$as_me:$LINENO: result: ${ok}" >&5 -echo "${ECHO_T}${ok}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ok}" >&5 +$as_echo "${ok}" >&6; } if test x"$ok" = xunknown; then - { echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5 -echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: we do not know how to create joinable pthreads" >&5 +$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} fi - { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 -echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; esac - { echo "$as_me:$LINENO: result: ${flag}" >&5 -echo "${ECHO_T}${flag}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi @@ -3336,10 +3537,10 @@ # More AIX lossage: must compile with cc_r # Extract the first word of "cc_r", so it can be a program name with args. set dummy cc_r; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. @@ -3349,14 +3550,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_PTHREAD_CC="cc_r" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" @@ -3364,11 +3565,11 @@ fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 -echo "${ECHO_T}$PTHREAD_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3396,12 +3597,12 @@ -{ echo "$as_me:$LINENO: *** Parsing options ***" >&5 -echo "$as_me: *** Parsing options ***" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Parsing options ***" >&5 +$as_echo "$as_me: *** Parsing options ***" >&6;} # Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then +if test "${with_ssl+set}" = set; then : withval=$with_ssl; CPPFLAGS="-I${with_ssl}/include ${CPPFLAGS}"; LDFLAGS="-L${with_ssl}/lib ${LDFLAGS}"; C_SSL="${with_ssl}" else C_SSL="" @@ -3411,7 +3612,7 @@ # Check whether --with-t_rsa was given. -if test "${with_t_rsa+set}" = set; then +if test "${with_t_rsa+set}" = set; then : withval=$with_t_rsa; CPPFLAGS="-DT_RSA_KEYS=${with_t_rsa} ${CPPFLAGS}"; C_T_RSA="${with_t_rsa}" else C_T_RSA="0" @@ -3421,7 +3622,7 @@ # Check whether --with-maxbuf was given. -if test "${with_maxbuf+set}" = set; then +if test "${with_maxbuf+set}" = set; then : withval=$with_maxbuf; CPPFLAGS="-DMAXBUF=${with_maxbuf} ${CPPFLAGS}"; C_MAXBUF="${with_maxbuf}" else C_MAXBUF="0" @@ -3432,7 +3633,7 @@ I_OWNER="" # Check whether --with-owner was given. -if test "${with_owner+set}" = set; then +if test "${with_owner+set}" = set; then : withval=$with_owner; I_OWNER="${with_owner}"; C_OWNER="${with_owner}" else C_OWNER="" @@ -3443,7 +3644,7 @@ I_GRP="" # Check whether --with-group was given. -if test "${with_group+set}" = set; then +if test "${with_group+set}" = set; then : withval=$with_group; I_GRP="${with_group}"; C_GROUP="${with_group}" else C_GROUP="" @@ -3452,7 +3653,7 @@ # Check whether --enable-super was given. -if test "${enable_super+set}" = set; then +if test "${enable_super+set}" = set; then : enableval=$enable_super; test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DUPER"; C_SUPER="1" else CFLAGS="${CFLAGS} -DUPER"; C_SUPER="0" @@ -3461,31 +3662,47 @@ # Check whether --enable-cert1l was given. -if test "${enable_cert1l+set}" = set; then +if test "${enable_cert1l+set}" = set; then : enableval=$enable_cert1l; test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DCERT1L"; C_CERT1L="1" +fi + + + +# Check whether --enable-pcreposix was given. +if test "${enable_pcreposix+set}" = set; then : + enableval=$enable_pcreposix; C_PCREPOSIX=${enableval} +else + C_PCREPOSIX=yes +fi + + +# Check whether --enable-tcmalloc was given. +if test "${enable_tcmalloc+set}" = set; then : + enableval=$enable_tcmalloc; C_TCMALLOC=${enableval} else - C_CERT1L="0" + C_TCMALLOC=yes fi +# Check whether --enable-hoard was given. +if test "${enable_hoard+set}" = set; then : + enableval=$enable_hoard; C_HOARD=${enableval} +else + C_HOARD=yes +fi -{ echo "$as_me:$LINENO: *** Checking for libraries ***" >&5 -echo "$as_me: *** Checking for libraries ***" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Checking for libraries ***" >&5 +$as_echo "$as_me: *** Checking for libraries ***" >&6;} LIBS="${LIBS} -lm" - -{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3503,39 +3720,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBDL 1 _ACEOF @@ -3544,18 +3740,14 @@ fi -{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_socket+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3573,54 +3765,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } -if test $ac_cv_lib_socket_socket = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = x""yes; then : LIBS="-lsocket -lnsl ${LIBS}" fi -{ echo "$as_me:$LINENO: checking for hstrerror in -lresolv" >&5 -echo $ECHO_N "checking for hstrerror in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv_hstrerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror in -lresolv" >&5 +$as_echo_n "checking for hstrerror in -lresolv... " >&6; } +if test "${ac_cv_lib_resolv_hstrerror+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3638,54 +3805,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_resolv_hstrerror=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_resolv_hstrerror=no + ac_cv_lib_resolv_hstrerror=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_hstrerror" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_hstrerror" >&6; } -if test $ac_cv_lib_resolv_hstrerror = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_hstrerror" >&5 +$as_echo "$ac_cv_lib_resolv_hstrerror" >&6; } +if test "x$ac_cv_lib_resolv_hstrerror" = x""yes; then : LIBS="-lresolv ${LIBS}" fi -{ echo "$as_me:$LINENO: checking for BIO_new in -lcrypto" >&5 -echo $ECHO_N "checking for BIO_new in -lcrypto... $ECHO_C" >&6; } -if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_new in -lcrypto" >&5 +$as_echo_n "checking for BIO_new in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3703,56 +3845,31 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_crypto_BIO_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_crypto_BIO_new=no + ac_cv_lib_crypto_BIO_new=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_new" >&5 -echo "${ECHO_T}$ac_cv_lib_crypto_BIO_new" >&6; } -if test $ac_cv_lib_crypto_BIO_new = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_new" >&5 +$as_echo "$ac_cv_lib_crypto_BIO_new" >&6; } +if test "x$ac_cv_lib_crypto_BIO_new" = x""yes; then : LIBS="-lcrypto ${LIBS}" else echo 'Missing OpenSSL (-lcrypto) - aborted'; exit 1 fi -{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5 -echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 +$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } +if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3770,56 +3887,32 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ssl_SSL_CTX_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ssl_SSL_CTX_new=no + ac_cv_lib_ssl_SSL_CTX_new=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; } -if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } +if test "x$ac_cv_lib_ssl_SSL_CTX_new" = x""yes; then : LIBS="-lssl ${LIBS}" else echo 'Missing OpenSSL (-lssl) - aborted'; exit 1 fi -{ echo "$as_me:$LINENO: checking for regcomp in -lpcreposix" >&5 -echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6; } -if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test x"$C_PCREPOSIX" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lpcreposix" >&5 +$as_echo_n "checking for regcomp in -lpcreposix... " >&6; } +if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3837,56 +3930,33 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pcreposix_regcomp=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pcreposix_regcomp=no + ac_cv_lib_pcreposix_regcomp=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcreposix_regcomp" >&5 -echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6; } -if test $ac_cv_lib_pcreposix_regcomp = yes; then - LIBS="-lpcreposix ${LIBS}" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcreposix_regcomp" >&5 +$as_echo "$ac_cv_lib_pcreposix_regcomp" >&6; } +if test "x$ac_cv_lib_pcreposix_regcomp" = x""yes; then : + LIBS="-lpcreposix ${LIBS}"; +$as_echo "#define HAVE_LIBPCREPOSIX 1" >>confdefs.h + else save_LIBS="$LIBS" LIBS="-lpcre $LIBS" - { echo "$as_me:$LINENO: checking for regexec in -lpcreposix" >&5 -echo $ECHO_N "checking for regexec in -lpcreposix... $ECHO_C" >&6; } -if test "${ac_cv_lib_pcreposix_regexec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regexec in -lpcreposix" >&5 +$as_echo_n "checking for regexec in -lpcreposix... " >&6; } +if test "${ac_cv_lib_pcreposix_regexec+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3904,40 +3974,21 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pcreposix_regexec=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pcreposix_regexec=no + ac_cv_lib_pcreposix_regexec=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcreposix_regexec" >&5 -echo "${ECHO_T}$ac_cv_lib_pcreposix_regexec" >&6; } -if test $ac_cv_lib_pcreposix_regexec = yes; then - LIBS="-lpcreposix -lpcre $save_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcreposix_regexec" >&5 +$as_echo "$ac_cv_lib_pcreposix_regexec" >&6; } +if test "x$ac_cv_lib_pcreposix_regexec" = x""yes; then : + LIBS="-lpcreposix -lpcre $save_LIBS"; +$as_echo "#define HAVE_LIBPCREPOSIX 1" >>confdefs.h + else LIBS="$save_LIBS" fi @@ -3945,18 +3996,16 @@ fi -{ echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 -echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6; } -if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +if test x"$C_TCMALLOC" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5 +$as_echo_n "checking for malloc in -ltcmalloc... " >&6; } +if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltcmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3974,55 +4023,31 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tcmalloc_malloc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tcmalloc_malloc=no + ac_cv_lib_tcmalloc_malloc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6; } -if test $ac_cv_lib_tcmalloc_malloc = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5 +$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; } +if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then : LIBS="${LIBS} -ltcmalloc" fi -if test "${ac_cv_lib_tcmalloc_malloc}" = "no"; then -{ echo "$as_me:$LINENO: checking for malloc in -lhoard" >&5 -echo $ECHO_N "checking for malloc in -lhoard... $ECHO_C" >&6; } -if test "${ac_cv_lib_hoard_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +else +if test x"$C_HOARD" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lhoard" >&5 +$as_echo_n "checking for malloc in -lhoard... " >&6; } +if test "${ac_cv_lib_hoard_malloc+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhoard $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4040,51 +4065,27 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_hoard_malloc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_hoard_malloc=no + ac_cv_lib_hoard_malloc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hoard_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_hoard_malloc" >&6; } -if test $ac_cv_lib_hoard_malloc = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5 +$as_echo "$ac_cv_lib_hoard_malloc" >&6; } +if test "x$ac_cv_lib_hoard_malloc" = x""yes; then : LIBS="${LIBS} -lhoard" fi fi +fi -{ echo "$as_me:$LINENO: checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS" >&5 -echo $ECHO_N "checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS" >&5 +$as_echo_n "checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4100,56 +4101,33 @@ return pthread_attr_setstacksize (); ; return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : CFLAGS="${CFLAGS} -DNEED_STACK" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } - -{ echo "$as_me:$LINENO: *** Checking for header files ***" >&5 -echo "$as_me: *** Checking for header files ***" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Checking for header files ***" >&5 +$as_echo "$as_me: *** Checking for header files ***" >&6;} ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -4163,11 +4141,7 @@ # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -4176,76 +4150,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -4257,8 +4189,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -4268,11 +4200,7 @@ # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -4281,83 +4209,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -4367,45 +4252,40 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4417,77 +4297,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4499,46 +4363,31 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -4553,47 +4402,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4603,18 +4428,14 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4624,14 +4445,10 @@ 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 + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -4658,113 +4475,36 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - 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 core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -4772,174 +4512,14 @@ done - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -for ac_header in arpa/inet.h errno.h netdb.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/un.h sys/time.h unistd.h getopt.h pthread.h sys/types.h sys/poll.h openssl/ssl.h openssl/engine.h time.h pwd.h grp.h signal.h regex.h ctype.h wait.h sys/wait.h sys/stat.h fcntl.h stdarg.h pcreposix.h pcre/pcreposix.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +for ac_header in arpa/inet.h errno.h netdb.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/un.h sys/time.h unistd.h getopt.h pthread.h sys/types.h sys/poll.h openssl/ssl.h openssl/engine.h time.h pwd.h grp.h signal.h regex.h ctype.h wait.h sys/wait.h sys/stat.h fcntl.h stdarg.h pcreposix.h pcre/pcreposix.h fnmatch.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -4947,20 +4527,16 @@ done -{ echo "$as_me:$LINENO: *** Checking for additonal information ***" >&5 -echo "$as_me: *** Checking for additonal information ***" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Checking for additonal information ***" >&5 +$as_echo "$as_me: *** Checking for additonal information ***" >&6;} save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -DSYSLOG_NAMES=1" -{ echo "$as_me:$LINENO: checking for facilitynames presence" >&5 -echo $ECHO_N "checking for facilitynames presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for facilitynames presence" >&5 +$as_echo_n "checking for facilitynames presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -4971,47 +4547,22 @@ { void *attr=(void *)facilitynames; ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ok=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ok=no + ok=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xyes; then -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CFLAGS="$save_CFLAGS -DHAVE_SYSLOG_H=1" else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/stdio.h> @@ -5025,55 +4576,30 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ok=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ok=no + ok=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xyes; then -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CFLAGS="$save_CFLAGS -DHAVE_SYS_SYSLOG_H=1" else -{ echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5 +$as_echo "missing" >&6; } CFLAGS="$save_CFLAGS -DHAVE_SYSLOG_H=1 -DMISS_FACILITYNAMES" fi fi -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <signal.h> @@ -5086,51 +4612,27 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_signal=int else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void + ac_cv_type_signal=void fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal _ACEOF -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5190,59 +4692,33 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if test "${ac_cv_type_uid_t+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then + $EGREP "uid_t" >/dev/null 2>&1; then : ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no @@ -5250,76 +4726,20 @@ rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF +$as_echo "#define uid_t int" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF +$as_echo "#define gid_t int" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef pid_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pid_t=no -fi +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -5328,16 +4748,12 @@ fi -{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/time.h> @@ -5345,487 +4761,181 @@ int main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_time=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for in_addr_t" >&5 -echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6; } -if test "${ac_cv_type_in_addr_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/types.h> -#include <netinet/in.h> - -typedef in_addr_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_in_addr_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_in_addr_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5 -echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6; } -if test $ac_cv_type_in_addr_t = yes; then - : -else - CFLAGS="${CFLAGS} -DNEED_INADDRT" -fi - -{ echo "$as_me:$LINENO: checking for in_port_t" >&5 -echo $ECHO_N "checking for in_port_t... $ECHO_C" >&6; } -if test "${ac_cv_type_in_port_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/types.h> -#include <netinet/in.h> - -typedef in_port_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_in_port_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_in_port_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_in_port_t" >&5 -echo "${ECHO_T}$ac_cv_type_in_port_t" >&6; } -if test $ac_cv_type_in_port_t = yes; then - : -else - CFLAGS="${CFLAGS} -DNEED_INPORTT" -fi - -{ echo "$as_me:$LINENO: checking for time_t" >&5 -echo $ECHO_N "checking for time_t... $ECHO_C" >&6; } -if test "${ac_cv_type_time_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <time.h> - -typedef time_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_time_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_time_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5 -echo "${ECHO_T}$ac_cv_type_time_t" >&6; } -if test $ac_cv_type_time_t = yes; then - : -else - CFLAGS="${CFLAGS} -DNEED_TIMET" -fi - - - -for ac_header in vfork.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes else - eval "$as_ac_Header=\$ac_header_preproc" + ac_cv_header_time=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then -done +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +fi -for ac_func in fork vfork -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if test "${ac_cv_type_long_long_int+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test "$cross_compiling" = yes; then : + ac_cv_type_long_long_int=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { -return $ac_func (); +long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_type_long_long_int=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_long_long_int=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +else + ac_cv_type_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +$as_echo "$ac_cv_type_long_long_int" >&6; } + if test $ac_cv_type_long_long_int = yes; then + +$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h + + fi + +ac_fn_c_check_type "$LINENO" "in_addr_t" "ac_cv_type_in_addr_t" "#include <sys/types.h> +#include <netinet/in.h> +" +if test "x$ac_cv_type_in_addr_t" = x""yes; then : + +else + CFLAGS="${CFLAGS} -DNEED_INADDRT" +fi + +ac_fn_c_check_type "$LINENO" "in_port_t" "ac_cv_type_in_port_t" "#include <sys/types.h> +#include <netinet/in.h> +" +if test "x$ac_cv_type_in_port_t" = x""yes; then : + +else + CFLAGS="${CFLAGS} -DNEED_INPORTT" +fi + +ac_fn_c_check_type "$LINENO" "time_t" "ac_cv_type_time_t" "#include <time.h> +" +if test "x$ac_cv_type_time_t" = x""yes; then : - eval "$as_ac_var=no" +else + CFLAGS="${CFLAGS} -DNEED_TIMET" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +for ac_header in vfork.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" +if test "x$ac_cv_header_vfork_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VFORK_H 1 +_ACEOF + fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + +done + +for ac_func in fork vfork +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done if test "x$ac_cv_func_fork" = xyes; then - { echo "$as_me:$LINENO: checking for working fork" >&5 -echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +$as_echo_n "checking for working fork... " >&6; } +if test "${ac_cv_func_fork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_fork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -5839,42 +4949,18 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_fork_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_fork_works=no + ac_cv_func_fork_works=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +$as_echo "$ac_cv_func_fork_works" >&6; } else ac_cv_func_fork_works=$ac_cv_func_fork @@ -5889,24 +4975,20 @@ ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - { echo "$as_me:$LINENO: checking for working vfork" >&5 -echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +$as_echo_n "checking for working vfork... " >&6; } +if test "${ac_cv_func_vfork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_vfork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ $ac_includes_default @@ -5998,319 +5080,50 @@ } } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_vfork_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_vfork_works=no + ac_cv_func_vfork_works=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +$as_echo "$ac_cv_func_vfork_works" >&6; } fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=$ac_cv_func_vfork - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} fi if test "x$ac_cv_func_vfork_works" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_VFORK 1 -_ACEOF +$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h else -cat >>confdefs.h <<\_ACEOF -#define vfork fork -_ACEOF +$as_echo "#define vfork fork" >>confdefs.h fi if test "x$ac_cv_func_fork_works" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_FORK 1 -_ACEOF - -fi - - -for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -done - -{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 -echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_malloc_0_nonnull=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include <stdlib.h> -#else -char *malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_malloc_0_nonnull=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 -echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 1 -_ACEOF - -else - cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 0 -_ACEOF - - case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -cat >>confdefs.h <<\_ACEOF -#define malloc rpl_malloc -_ACEOF - -fi - - - -{ echo "$as_me:$LINENO: checking for working memcmp" >&5 -echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 +$as_echo_n "checking for working memcmp... " >&6; } +if test "${ac_cv_func_memcmp_working+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_memcmp_working=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -6345,42 +5158,18 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_memcmp_working=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_memcmp_working=no + ac_cv_func_memcmp_working=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 +$as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in *" memcmp.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" @@ -6388,165 +5177,29 @@ esac - - for ac_header in sys/select.h sys/socket.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking types of arguments for select" >&5 -echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6; } -if test "${ac_cv_func_select_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 +$as_echo_n "checking types of arguments for select... " >&6; } +if test "${ac_cv_func_select_args+set}" = set; then : + $as_echo_n "(cached) " >&6 else for ac_arg234 in 'fd_set *' 'int *' 'void *'; do for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #ifdef HAVE_SYS_SELECT_H @@ -6566,31 +5219,9 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done done @@ -6599,8 +5230,8 @@ : ${ac_cv_func_select_args='int,int *,struct timeval *'} fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5 -echo "${ECHO_T}$ac_cv_func_select_args" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 +$as_echo "$ac_cv_func_select_args" >&6; } ac_save_IFS=$IFS; IFS=',' set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` IFS=$ac_save_IFS @@ -6622,16 +5253,12 @@ rm -f conftest* -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <signal.h> @@ -6644,64 +5271,40 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_signal=int else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void + ac_cv_type_signal=void fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal _ACEOF -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_lstat_dereferences_slashed_symlink=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int main () { struct stat sbuf; - /* Linux will dereference the symlink and fail. + /* Linux will dereference the symlink and fail, as required by POSIX. That is better in the sense that it means we will not have to compile and use the lstat wrapper. */ return lstat ("conftest.sym/", &sbuf) == 0; @@ -6709,39 +5312,15 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_lstat_dereferences_slashed_symlink=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no + ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - else # If the `ln -s' command failed, then we probably don't even # have an lstat function. @@ -6750,8 +5329,8 @@ rm -f conftest.sym conftest.file fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && @@ -6760,7 +5339,7 @@ _ACEOF -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then case " $LIBOBJS " in *" lstat.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS lstat.$ac_objext" @@ -6769,19 +5348,15 @@ fi -{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 +$as_echo_n "checking whether stat accepts an empty string... " >&6; } +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_stat_empty_string_bug=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -6793,42 +5368,18 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_stat_empty_string_bug=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_func_stat_empty_string_bug=yes + ac_cv_func_stat_empty_string_bug=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 +$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } if test $ac_cv_func_stat_empty_string_bug = yes; then case " $LIBOBJS " in *" stat.$ac_objext "* ) ;; @@ -6843,111 +5394,24 @@ fi - for ac_func in strftime -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +if test "x$ac_cv_func_strftime" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_STRFTIME 1 _ACEOF else # strftime is in -lintl on SCO UNIX. -{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_strftime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 +$as_echo_n "checking for strftime in -lintl... " >&6; } +if test "${ac_cv_lib_intl_strftime+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6965,154 +5429,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_strftime=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_strftime=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } -if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF - -LIBS="-lintl $LIBS" -fi - -fi -done - - - - - - - - - - - - - - - - - - -for ac_func in getaddrinfo inet_ntop memset regcomp poll socket strcasecmp strchr strdup strerror strncasecmp strspn strtol setsid X509_STORE_set_flags localtime_r gettimeofday -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_strftime=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_intl_strftime=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 +$as_echo "$ac_cv_lib_intl_strftime" >&6; } +if test "x$ac_cv_lib_intl_strftime" = x""yes; then : + $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h - eval "$as_ac_var=no" +LIBS="-lintl $LIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +done + +for ac_func in getaddrinfo inet_ntop memset regcomp poll socket strcasecmp strchr strdup strerror strncasecmp strspn strtol setsid X509_STORE_set_flags localtime_r gettimeofday +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -7170,12 +5514,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -7183,8 +5528,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `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" @@ -7207,12 +5552,12 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -7228,11 +5573,11 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -7241,11 +5586,13 @@ : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -7255,59 +5602,79 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\$.*\$"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\$.*\$$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; + esac; + expr "X$arg" : "X\$.*\$" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -7316,20 +5683,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -7340,32 +5705,111 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi -done + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '$a$' >/dev/null 2>&1 && test "X`expr 00001 : '.*$...$'`" = X001; then as_expr=expr @@ -7379,13 +5823,17 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ X"$0" : 'X$//$$' \| \ X"$0" : 'X$/$' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/ q @@ -7400,104 +5848,103 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '$a$' >/dev/null 2>&1 && - test "X`expr 00001 : '.*$...$'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -7514,12 +5961,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -7534,13 +5981,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pound $as_me 2.4.5, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by pound $as_me 2.6, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7553,29 +6006,41 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -7583,27 +6048,28 @@ Configuration headers: $config_headers -Report bugs to <bug-autoconf@gnu.org>." +Report bugs to <roseg@apsis.ch>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pound config.status 2.4.5 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +pound config.status 2.6 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -7625,34 +6091,40 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -7667,30 +6139,32 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -7699,9 +6173,7 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -7727,7 +6199,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -7738,143 +6210,139 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -acx_pthread_config!$acx_pthread_config$ac_delim -PTHREAD_CC!$PTHREAD_CC$ac_delim -PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim -C_SSL!$C_SSL$ac_delim -C_T_RSA!$C_T_RSA$ac_delim -C_MAXBUF!$C_MAXBUF$ac_delim -C_OWNER!$C_OWNER$ac_delim -C_GROUP!$C_GROUP$ac_delim -C_SUPER!$C_SUPER$ac_delim -C_CERT1L!$C_CERT1L$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -I_OWNER!$I_OWNER$ac_delim -I_GRP!$I_GRP$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/$.\{148\}$..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/$.\{148\}$..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' <conf$$subs.awk | sed ' +/^[^""]/{ + N + s/\n// +} +' >>$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -7891,20 +6359,128 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h | sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -7932,26 +6508,34 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -7961,42 +6545,7 @@ X"$ac_file" : 'X$//$[^/]' \| \ X"$ac_file" : 'X$//$$' \| \ X"$ac_file" : 'X$/$' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X$\/\/$[^/].*/{ - s//\1/ - q - } - /^X$\/\/$$/{ - s//\1/ - q - } - /^X$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X$//$[^/]' \| \ - X"$as_dir" : 'X$//$$' \| \ - X"$as_dir" : 'X$/$' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$ac_file" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -8014,20 +6563,15 @@ q } s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -8067,12 +6611,12 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -8080,36 +6624,37 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -8119,119 +6664,48 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\$[ #]*\$[^ ]*\$[ ]*' -ac_dB='\$[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" ;; @@ -8240,11 +6714,13 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -8264,6 +6740,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi

@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch */ @@ -82,12 +81,12 @@ * Read and write some binary data */ static int -copy_bin(BIO *const cl, BIO *const be, long cont, long *res_bytes, const int no_write) +copy_bin(BIO *const cl, BIO *const be, LONG cont, LONG *res_bytes, const int no_write) { char buf[MAXBUF]; int res; - while(cont > 0L) { + while(cont > L0) { if((res = BIO_read(cl, buf, cont > MAXBUF? MAXBUF: cont)) < 0) return -1; else if(res == 0) @@ -110,7 +109,7 @@ * The result buffer is NULL terminated * Return 0 on success */ -static +static int get_line(BIO *const in, char *const buf, const int bufsize) { char tmp; @@ -126,7 +125,7 @@ case -1: return 1; default: - for(i = n_read; i < bufsize; i++) + for(i = n_read; i < bufsize && buf[i]; i++) if(buf[i] == '\n' || buf[i] == '\r') { buf[i] = '\0'; return 0; @@ -149,7 +148,7 @@ /* * Strip trailing CRLF */ -static +static int strip_eol(char *lin) { while(*lin) @@ -165,12 +164,12 @@ * Copy chunked */ static int -copy_chunks(BIO *const cl, BIO *const be, long *res_bytes, const int no_write, const long max_size) +copy_chunks(BIO *const cl, BIO *const be, LONG *res_bytes, const int no_write, const LONG max_size) { char buf[MAXBUF]; - long cont, tot_size; + LONG cont, tot_size; regmatch_t matches[2]; - int has_eol, res; + int res; for(tot_size = 0L;;) { if((res = get_line(cl, buf, MAXBUF)) < 0) { @@ -180,7 +179,7 @@ /* EOF */ return 0; if(!regexec(&CHUNK_HEAD, buf, 2, matches, 0)) - cont = strtol(buf, NULL, 16); + cont = STRTOL(buf, NULL, 16); else { /* not chunk header */ logmsg(LOG_NOTICE, "(%lx) bad chunk header <%s>: %s", pthread_self(), buf, strerror(errno)); @@ -193,12 +192,12 @@ } tot_size += cont; - if(max_size > 0L && tot_size > max_size) { + if(max_size > L0 && tot_size > max_size) { logmsg(LOG_WARNING, "(%lx) chunk content too large", pthread_self); return -4; } - if(cont > 0L) { + if(cont > L0) { if(copy_bin(cl, be, cont, res_bytes, no_write)) { if(errno) logmsg(LOG_NOTICE, "(%lx) error copy chunk cont: %s", pthread_self(), strerror(errno)); @@ -454,15 +453,19 @@ #endif } -#define LOG_BYTES_SIZE 16 +#define LOG_BYTES_SIZE 32 /* * Apache log-file-style number format */ static void -log_bytes(char *res, const long cnt) +log_bytes(char *res, const LONG cnt) { - if(cnt > 0L) + if(cnt > L0) +#ifdef HAVE_LONG_LONG_INT + snprintf(res, LOG_BYTES_SIZE - 1, "%lld", cnt); +#else snprintf(res, LOG_BYTES_SIZE - 1, "%ld", cnt); +#endif else strcpy(res, "-"); return; @@ -481,10 +484,10 @@ /* * handle an HTTP request */ -void * -thr_http(void *arg) +void +do_http(thr_arg *arg) { - int cl_11, be_11, res, chunked, n, sock, no_cont, skip, conn_closed, force_10, sock_proto; + int cl_11, be_11, res, chunked, n, sock, no_cont, skip, conn_closed, force_10, sock_proto, is_rpc; LISTENER *lstn; SERVICE *svc; BACKEND *backend, *cur_backend, *old_backend; @@ -495,8 +498,8 @@ char request[MAXBUF], response[MAXBUF], buf[MAXBUF], url[MAXBUF], loc_path[MAXBUF], **headers, headers_ok[MAXHEADERS], v_host[MAXBUF], referer[MAXBUF], u_agent[MAXBUF], u_name[MAXBUF], caddr[MAXBUF], req_time[LOG_TIME_SIZE], s_res_bytes[LOG_BYTES_SIZE], *mh; - SSL *ssl; - long cont, res_bytes; + SSL *ssl, *be_ssl; + LONG cont, res_bytes; regmatch_t matches[4]; struct linger l; double start_req, end_req; @@ -530,7 +533,7 @@ logmsg(LOG_WARNING, "(%lx) BIO_new_socket failed", pthread_self()); shutdown(sock, 2); close(sock); - pthread_exit(NULL); + return; } if(lstn->to > 0) { BIO_set_callback_arg(cl, (char *)&lstn->to); @@ -538,18 +541,18 @@ } if(lstn->ctx != NULL) { - if((ssl = SSL_new(lstn->ctx)) == NULL) { + if((ssl = SSL_new(lstn->ctx->ctx)) == NULL) { logmsg(LOG_WARNING, "(%lx) SSL_new: failed", pthread_self()); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } SSL_set_bio(ssl, cl, cl); if((bb = BIO_new(BIO_f_ssl())) == NULL) { logmsg(LOG_WARNING, "(%lx) BIO_new(Bio_f_ssl()) failed", pthread_self()); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } BIO_set_ssl(bb, ssl, BIO_CLOSE); BIO_set_ssl_mode(bb, 0); @@ -563,7 +566,7 @@ */ BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } else { if((x509 = SSL_get_peer_certificate(ssl)) != NULL && lstn->clnt_check < 3 && SSL_get_verify_result(ssl) != X509_V_OK) { @@ -571,7 +574,7 @@ logmsg(LOG_NOTICE, "Bad certificate from %s", caddr); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } } } else { @@ -583,14 +586,15 @@ logmsg(LOG_WARNING, "(%lx) BIO_new(buffer) failed", pthread_self()); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } BIO_set_close(cl, BIO_CLOSE); BIO_set_buffer_size(cl, MAXBUF); cl = BIO_push(bb, cl); for(cl_11 = be_11 = 0;;) { - res_bytes = 0L; + res_bytes = L0; + is_rpc = -1; v_host[0] = referer[0] = u_agent[0] = u_name[0] = '\0'; conn_closed = 0; for(n = 0; n < MAXHEADERS; n++) @@ -604,7 +608,7 @@ } } clean_all(); - pthread_exit(NULL); + return; } memset(req_time, 0, LOG_TIME_SIZE); start_req = cur_time(); @@ -614,28 +618,40 @@ strncpy(request, headers[0], MAXBUF); if(!regexec(&lstn->verb, request, 3, matches, 0)) { no_cont = !strncasecmp(request + matches[1].rm_so, "HEAD", matches[1].rm_eo - matches[1].rm_so); + if(!strncasecmp(request + matches[1].rm_so, "RPC_IN_DATA", matches[1].rm_eo - matches[1].rm_so)) + is_rpc = 1; + else if(!strncasecmp(request + matches[1].rm_so, "RPC_OUT_DATA", matches[1].rm_eo - matches[1].rm_so)) + is_rpc = 0; } else { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_WARNING, "(%lx) e501 bad request \"%s\" from %s", pthread_self(), request, caddr); err_reply(cl, h501, lstn->err501); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } cl_11 = (request[strlen(request) - 1] == '1'); - strncpy(url, request + matches[2].rm_so, matches[2].rm_eo - matches[2].rm_so); - url[matches[2].rm_eo - matches[2].rm_so] = '\0'; + n = cpURL(url, request + matches[2].rm_so, matches[2].rm_eo - matches[2].rm_so); + if(n != strlen(url)) { + /* the URL probably contained a %00 aka NULL - which we don't allow */ + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e501 URL \"%s\" (contains NULL) from %s", pthread_self(), url, caddr); + err_reply(cl, h501, lstn->err501); + free_headers(headers); + clean_all(); + return; + } if(lstn->has_pat && regexec(&lstn->url_pat, url, 0, NULL, 0)) { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_NOTICE, "(%lx) e501 bad URL \"%s\" from %s", pthread_self(), url, caddr); err_reply(cl, h501, lstn->err501); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } /* check other headers */ - for(chunked = 0, cont = 0L, n = 1; n < MAXHEADERS && headers[n]; n++) { + for(chunked = 0, cont = L_1, n = 1; n < MAXHEADERS && headers[n]; n++) { /* no overflow - see check_header for details */ switch(check_header(headers[n], buf)) { case HEADER_HOST: @@ -652,7 +668,7 @@ conn_closed = 1; break; case HEADER_TRANSFER_ENCODING: - if(cont != 0L) + if(cont >= L0) headers_ok[n] = 0; else if(!strcasecmp("chunked", buf)) if(chunked) @@ -661,10 +677,11 @@ chunked = 1; break; case HEADER_CONTENT_LENGTH: - if(chunked) + if(chunked || cont >= 0L) headers_ok[n] = 0; else - cont = atol(buf); + if((cont = ATOL(buf)) < 0L) + headers_ok[n] = 0; break; case HEADER_ILLEGAL: if(lstn->log_level > 0) { @@ -714,13 +731,13 @@ } /* possibly limited request size */ - if(lstn->max_req > 0L && cont > 0L && cont > lstn->max_req) { + if(lstn->max_req > L0 && cont > L0 && cont > lstn->max_req && is_rpc != 1) { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_NOTICE, "(%lx) e501 request too large (%ld) from %s", pthread_self(), cont, caddr); err_reply(cl, h501, lstn->err501); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } if(be != NULL) { @@ -735,19 +752,19 @@ /* check that the requested URL still fits the old back-end (if any) */ if((svc = get_service(lstn, url, &headers[1])) == NULL) { addr2str(caddr, MAXBUF - 1, &from_host, 1); - logmsg(LOG_NOTICE, "(%lx) e503 no service \"%s\" from %s", pthread_self(), request, caddr); + logmsg(LOG_NOTICE, "(%lx) e503 no service \"%s\" from %s %s", pthread_self(), request, caddr, v_host[0]? v_host: "-"); err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } if((backend = get_backend(svc, &from_host, url, &headers[1])) == NULL) { addr2str(caddr, MAXBUF - 1, &from_host, 1); - logmsg(LOG_NOTICE, "(%lx) e503 no back-end \"%s\" from %s", pthread_self(), request, caddr); + logmsg(LOG_NOTICE, "(%lx) e503 no back-end \"%s\" from %s %s", pthread_self(), request, caddr, v_host[0]? v_host: "-"); err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } if(be != NULL && backend != cur_backend) { @@ -771,8 +788,7 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); - break; + return; } if((sock = socket(sock_proto, SOCK_STREAM, 0)) < 0) { str_be(buf, MAXBUF - 1, backend); @@ -780,9 +796,9 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } - if(connect_nb(sock, &backend->addr, backend->to) < 0) { + if(connect_nb(sock, &backend->addr, backend->conn_to) < 0) { str_be(buf, MAXBUF - 1, backend); logmsg(LOG_WARNING, "(%lx) backend %s connect: %s", pthread_self(), buf, strerror(errno)); shutdown(sock, 2); @@ -804,7 +820,7 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } continue; } @@ -828,19 +844,48 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } BIO_set_close(be, BIO_CLOSE); if(backend->to > 0) { BIO_set_callback_arg(be, (char *)&backend->to); BIO_set_callback(be, bio_callback); } + if(backend->ctx != NULL) { + if((be_ssl = SSL_new(backend->ctx)) == NULL) { + logmsg(LOG_WARNING, "(%lx) be SSL_new: failed", pthread_self()); + err_reply(cl, h503, lstn->err503); + free_headers(headers); + clean_all(); + return; + } + SSL_set_bio(be_ssl, be, be); + if((bb = BIO_new(BIO_f_ssl())) == NULL) { + logmsg(LOG_WARNING, "(%lx) BIO_new(Bio_f_ssl()) failed", pthread_self()); + err_reply(cl, h503, lstn->err503); + free_headers(headers); + clean_all(); + return; + } + BIO_set_ssl(bb, be_ssl, BIO_CLOSE); + BIO_set_ssl_mode(bb, 1); + be = bb; + if(BIO_do_handshake(be) <= 0) { + str_be(buf, MAXBUF - 1, backend); + logmsg(LOG_NOTICE, "BIO_do_handshake with %s failed: %s", buf, + ERR_error_string(ERR_get_error(), NULL)); + err_reply(cl, h503, lstn->err503); + free_headers(headers); + clean_all(); + return; + } + } if((bb = BIO_new(BIO_f_buffer())) == NULL) { logmsg(LOG_WARNING, "(%lx) e503 BIO_new(buffer) server failed", pthread_self()); err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } BIO_set_buffer_size(bb, MAXBUF); BIO_set_close(bb, BIO_CLOSE); @@ -875,7 +920,7 @@ pthread_self(), strerror(errno)); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } if(BIO_printf(be, "%s\r\n", headers[n]) <= 0) { @@ -887,7 +932,7 @@ err_reply(cl, h500, lstn->err500); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } /* add header if required */ @@ -895,12 +940,12 @@ if(BIO_printf(be, "%s\r\n", lstn->add_head) <= 0) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_WARNING, "(%lx) e500 error write HTTPSHeader to %s: %s (%.3f sec)", + logmsg(LOG_WARNING, "(%lx) e500 error write AddHeader to %s: %s (%.3f sec)", pthread_self(), buf, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } free_headers(headers); @@ -919,7 +964,7 @@ pthread_self(), buf, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } } @@ -934,7 +979,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } X509_NAME_print_ex(bb, X509_get_issuer_name(x509), 8, XN_FLAG_ONELINE & ~ASN1_STRFLGS_ESC_MSB); @@ -947,7 +992,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } ASN1_TIME_print(bb, X509_get_notBefore(x509)); @@ -960,7 +1005,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } ASN1_TIME_print(bb, X509_get_notAfter(x509)); @@ -973,7 +1018,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } if(BIO_printf(be, "X-SSL-serial: %ld\r\n", ASN1_INTEGER_get(X509_get_serialNumber(x509))) <= 0) { str_be(buf, MAXBUF - 1, cur_backend); @@ -983,7 +1028,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } #ifdef CERT1L PEM_write_bio_X509(bb, x509); @@ -996,7 +1041,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } while(get_line(bb, buf, MAXBUF) == 0) { if(BIO_printf(be, "%s", buf) <= 0) { @@ -1007,7 +1052,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } } if(BIO_printf(be, "\r\n", buf) <= 0) { @@ -1018,7 +1063,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } #else PEM_write_bio_X509(bb, x509); @@ -1031,7 +1076,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } while(get_line(bb, buf, MAXBUF) == 0) { if(BIO_printf(be, "\t%s\r\n", buf) <= 0) { @@ -1042,7 +1087,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } } #endif @@ -1063,22 +1108,88 @@ if(copy_chunks(cl, be, NULL, cur_backend->be_type, lstn->max_req)) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 copy_chunks to %s/%s (%.3f sec)", - pthread_self(), buf, request, (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s copy_chunks to %s/%s (%.3f sec)", + pthread_self(), caddr, buf, request, (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } - } else if(cont > 0L) { + } else if(cont > L0 && is_rpc != 1) { /* had Content-length, so do raw reads/writes for the length */ if(copy_bin(cl, be, cont, NULL, cur_backend->be_type)) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 error copy client cont to %s/%s: %s (%.3f sec)", - pthread_self(), buf, request, strerror(errno), (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s error copy client cont to %s/%s: %s (%.3f sec)", + pthread_self(), caddr, buf, request, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; + } + } else if(cont > 0L && is_readable(cl, lstn->to)) { + char one; + BIO *cl_unbuf; + /* + * special mode for RPC_IN_DATA - content until EOF + * force HTTP/1.0 - client closes connection when done. + */ + cl_11 = be_11 = 0; + + /* + * first read whatever is already in the input buffer + */ + while(BIO_pending(cl)) { + if(BIO_read(cl, &one, 1) != 1) { + logmsg(LOG_NOTICE, "(%lx) error read request pending: %s", + pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } + if (++res_bytes > cont) { + logmsg(LOG_NOTICE, "(%lx) error read request pending: max. RPC length exceeded", + pthread_self()); + clean_all(); + pthread_exit(NULL); + } + if(BIO_write(be, &one, 1) != 1) { + if(errno) + logmsg(LOG_NOTICE, "(%lx) error write request pending: %s", + pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } + } + BIO_flush(be); + + /* + * find the socket BIO in the chain + */ + if ((cl_unbuf = BIO_find_type(cl, lstn->ctx? BIO_TYPE_SSL : BIO_TYPE_SOCKET)) == NULL) { + logmsg(LOG_WARNING, "(%lx) error get unbuffered: %s", pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } + + /* + * copy till EOF + */ + while((res = BIO_read(cl_unbuf, buf, MAXBUF)) > 0) { + if((res_bytes += res) > cont) { + logmsg(LOG_NOTICE, "(%lx) error copy request body: max. RPC length exceeded", + pthread_self()); + clean_all(); + pthread_exit(NULL); + } + if(BIO_write(be, buf, res) != res) { + if(errno) + logmsg(LOG_NOTICE, "(%lx) error copy request body: %s", + pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } else { + BIO_flush(be); + } } } @@ -1086,11 +1197,12 @@ if(cur_backend->be_type == 0 && BIO_flush(be) != 1) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 error flush to %s/%s: %s (%.3f sec)", - pthread_self(), buf, request, strerror(errno), (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s error flush to %s/%s: %s (%.3f sec)", + pthread_self(), caddr, buf, request, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } /* @@ -1114,7 +1226,7 @@ /* if we have a redirector */ if(cur_backend->be_type) { memset(buf, 0, sizeof(buf)); - if(cur_backend->redir_req) + if(!cur_backend->redir_req) snprintf(buf, sizeof(buf) - 1, "%s%s", cur_backend->url, url); else strncpy(buf, cur_backend->url, sizeof(buf) - 1); @@ -1144,6 +1256,51 @@ if(!cl_11 || conn_closed || force_10) break; continue; + } else if(is_rpc == 1) { + /* log RPC_IN_DATA */ + end_req = cur_time(); + memset(s_res_bytes, 0, LOG_BYTES_SIZE); + /* actual request length */ + log_bytes(s_res_bytes, res_bytes); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + str_be(buf, MAXBUF - 1, cur_backend); + switch(lstn->log_level) { + case 0: + break; + case 1: + logmsg(LOG_INFO, "%s %s - -", caddr, request); + break; + case 2: + if(v_host[0]) + logmsg(LOG_INFO, "%s %s - - (%s/%s -> %s) %.3f sec", + caddr, request, v_host, svc->name[0]? svc->name: "-", buf, + (end_req - start_req) / 1000000.0); + else + logmsg(LOG_INFO, "%s %s - - (%s -> %s) %.3f sec", + caddr, request, svc->name[0]? svc->name: "-", buf, + (end_req - start_req) / 1000000.0); + break; + case 3: + logmsg(LOG_INFO, "%s %s - %s [%s] \"%s\" 000 %s \"%s\" \"%s\"", + v_host[0]? v_host: "-", + caddr, u_name[0]? u_name: "-", req_time, request, + s_res_bytes, referer, u_agent); + break; + case 4: + logmsg(LOG_INFO, "%s - %s [%s] \"%s\" 000 %s \"%s\" \"%s\"", + caddr, u_name[0]? u_name: "-", req_time, request, + s_res_bytes, referer, u_agent); + break; + case 5: + logmsg(LOG_INFO, "%s %s - %s [%s] \"%s\" 000 %s \"%s\" \"%s\" (%s -> %s) %.3f sec", + v_host[0]? v_host: "-", + caddr, u_name[0]? u_name: "-", req_time, request, + s_res_bytes, referer, u_agent, svc->name[0]? svc->name: "-", buf, + (end_req - start_req) / 1000000.0); + break; + } + /* no response expected - bail out */ + break; } /* get the response */ @@ -1151,11 +1308,12 @@ if((headers = get_headers(be, cl, lstn)) == NULL) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 response error read from %s/%s: %s (%.3f secs)", - pthread_self(), buf, request, strerror(errno), (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s response error read from %s/%s: %s (%.3f secs)", + pthread_self(), caddr, buf, request, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } strncpy(response, headers[0], MAXBUF); @@ -1179,10 +1337,13 @@ } break; case HEADER_CONTENT_LENGTH: - cont = atol(buf); + cont = ATOL(buf); + /* treat RPC_OUT_DATA like reply without content-length */ + if(is_rpc == 0 && cont == 0x40000000L) + cont = -1L; break; case HEADER_LOCATION: - if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, lstn, cur_backend)) { + if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, v_host, lstn, cur_backend)) { snprintf(buf, MAXBUF, "Location: %s://%s/%s", (ssl == NULL? "http": "https"), v_host, loc_path); free(headers[n]); @@ -1191,12 +1352,12 @@ pthread_self(), strerror(errno)); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } break; case HEADER_CONTLOCATION: - if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, lstn, cur_backend)) { + if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, v_host, lstn, cur_backend)) { snprintf(buf, MAXBUF, "Content-location: %s://%s/%s", (ssl == NULL? "http": "https"), v_host, loc_path); free(headers[n]); @@ -1205,7 +1366,7 @@ pthread_self(), strerror(errno)); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } break; @@ -1225,7 +1386,7 @@ } free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } free_headers(headers); @@ -1239,25 +1400,25 @@ logmsg(LOG_NOTICE, "(%lx) error flush headers to %s: %s", pthread_self(), caddr, strerror(errno)); } clean_all(); - pthread_exit(NULL); + return; } if(!no_cont) { /* ignore this if request was HEAD or similar */ if(be_11 && chunked) { /* had Transfer-encoding: chunked so read/write all the chunks (HTTP/1.1 only) */ - if(copy_chunks(be, cl, &res_bytes, skip, 0L)) { + if(copy_chunks(be, cl, &res_bytes, skip, L0)) { /* copy_chunks() has its own error messages */ clean_all(); - pthread_exit(NULL); + return; } - } else if(cont >= 0L) { + } else if(cont >= L0) { /* may have had Content-length, so do raw reads/writes for the length */ if(copy_bin(be, cl, cont, &res_bytes, skip)) { if(errno) logmsg(LOG_NOTICE, "(%lx) error copy server cont: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } } else if(!skip) { if(is_readable(be, cur_backend->to)) { @@ -1277,14 +1438,14 @@ logmsg(LOG_NOTICE, "(%lx) error read response pending: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } if(BIO_write(cl, &one, 1) != 1) { if(errno) logmsg(LOG_NOTICE, "(%lx) error write response pending: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } res_bytes++; } @@ -1293,10 +1454,10 @@ /* * find the socket BIO in the chain */ - if((be_unbuf = BIO_find_type(be, BIO_TYPE_SOCKET)) == NULL) { + if((be_unbuf = BIO_find_type(be, cur_backend->ctx? BIO_TYPE_SSL : BIO_TYPE_SOCKET)) == NULL) { logmsg(LOG_WARNING, "(%lx) error get unbuffered: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } /* @@ -1308,7 +1469,7 @@ logmsg(LOG_NOTICE, "(%lx) error copy response body: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } else { res_bytes += res; BIO_flush(cl); @@ -1317,12 +1478,15 @@ } } if(BIO_flush(cl) != 1) { + /* client closes RPC_OUT_DATA connection - no error */ + if(is_rpc == 0 && res_bytes > 0L) + break; if(errno) { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_NOTICE, "(%lx) error final flush to %s: %s", pthread_self(), caddr, strerror(errno)); } clean_all(); - pthread_exit(NULL); + return; } } } @@ -1394,5 +1558,17 @@ SSL_set_shutdown(ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); clean_all(); - pthread_exit(NULL); + return; +} + +void * +thr_http(void *dummy) +{ + thr_arg *arg; + + for(;;) { + while((arg = get_thr_arg()) == NULL) + logmsg(LOG_WARNING, "NULL get_thr_arg"); + do_http(arg); + } }

@@ -1,4 +1,4 @@ -.TH POUND "8" "May 2002" "pound" "System Manager's Manual" +.TH POUND "8" "Jan 2010" "pound" "System Manager's Manual" .SH NAME pound \- HTTP/HTTPS reverse-proxy and load-balancer .SH SYNOPSIS @@ -222,6 +222,16 @@ to work like a regular process. Useful for debugging or if you want to use something like \fIdaemontools\fR. .TP +\fBThreads\fR nnn +How many worker threads +.B Pound +should use. Default: 128. Tune this parameter to improve performance. +If you set it too high, +.B Pound +will use a lot memory, and some CPU will be wasted on context switches. +If you set it too low requests may be served with some delay. Experiment +to find the optimal value for your installation. +.TP \fBLogFacility\fR value Specify the log facility to use. .I value @@ -243,6 +253,10 @@ used). This value can be overridden for specific listeners. .TP +\fBIgnoreCase\fR 0|1 +Ignore case when matching URLs (default: 0). This value can be +overridden for specific services. +.TP \fBDynScale\fR 0|1 Enable or disable the dynamic rescaling code (default: 0). If enabled .B Pound @@ -275,6 +289,13 @@ wait for a response from the back-end (in seconds). Default: 15 seconds. This value can be overridden for specific back-ends. .TP +\fBConnTO\fR value +How long should +.B Pound +wait for a connection to the back-end (in seconds). Default: the +.B TimeOut +value. This value can be overridden for specific back-ends. +.TP \fBGrace\fR value How long should .B Pound @@ -296,6 +317,9 @@ the .I poundctl(8) program. +.TP +\fBInclude\fR "/path/to/file" +Include the file as though it were part of the configuration file. .SH "HTTP Listener" An HTTP listener defines an address and port that .B Pound @@ -394,7 +418,8 @@ .TP \fBAddHeader\fR "header: to add" Add the defined header to the request passed to the back-end server. The header -is added verbatim. +is added verbatim. Use multiple \fIAddHeader\fR directives if you need to add more +than one header. .TP \fBRewriteLocation\fR 0|1|2 If 1 force @@ -443,12 +468,31 @@ for this server. This directive is .B mandatory for HTTPS listeners. +.IP +Please note that multiple +.I Cert +directives are allowed if your OpenSSL version supports SNI. In such cases, +the first directive is the default certificate, with additional certificates +used if the client requests them. +.IP +The ordering of the directives is important: the first certificate where the CN +matches the client request will be used, so put your directives in the +most-specific-to-least specific order (i.e. wildcard certificates +.B after +host-specific certificates). +.IP +.I Cert +directives +.B must +precede all other SSL-specific directives. .TP \fBClientCert\fR 0|1|2|3 depth Ask for the client's HTTPS certificate: 0 - don't ask (default), 1 - ask, 2 - ask and fail if no certificate was presented, 3 - ask but do not verify. -.I depth -is the depth of verification for a client certificate (up to 9). +.I Depth +is the depth of verification for a client certificate (up to 9). The default +depth limit is 9, allowing for the peer certificate and additional 9 CA +certificates that must be verified. .TP \fBCiphers\fR "acceptable:cipher:list" This is the list of ciphers that will be accepted by the SSL connection; it is a @@ -506,7 +550,14 @@ .I URL conditions per service. If no .I URL -was defined then all requests match. +was defined then all requests match. The matching is by default case-sensitive, +but this can be overridden by specifying +.B IgnoreCase 1 +.TP +\fBIgnoreCase\fR 0|1 +Override the global +.B IgnoreCase +setting. .TP \fBHeadRequire\fR "pattern" The request must contain at least on header matching the given pattern. @@ -533,6 +584,14 @@ Enable or disable dynamic rescaling for the current service. This value will override the value globally defined. .TP +\fBDisabled\fR 0|1 +Start +.B Pound +with this service disabled (1) or enabled (0). If started as disabled, the +service can be later enabled with +.I poundctl +(8). +.TP \fBBackEnd\fR Directives enclosed between a .I BackEnd @@ -636,6 +695,13 @@ .B mandatory parameter for non Unix-domain back-ends. .TP +\fBHTTPS\fR [ "cert" ] +The back-end is using HTTPS. If the optional parameter +.I cert +is specified, +.B Pound +will present this certificate to the back-end. +.TP \fBPriority\fR val The priority of this back-end (between 1 and 9, 5 is default). Higher priority back-ends will be used more often than lower priority ones, so you should @@ -646,12 +712,25 @@ .I TimeOut value. .TP +\fBConnTO\fR val +Override the global +.I ConnTO +value. +.TP \fBHAport\fR [ address ] port A port (and optional address) to be used for server function checks. See below the "High Availability" section for a more detailed discussion. By default .B Pound uses the same address as the back-end server, but you may use a separate address if you wish. This directive applies only to non Unix-domain servers. +.TP +\fBDisabled\fR 0|1 +Start +.B Pound +with this back-end disabled (1) or enabled (0). If started as disabled, the +back-end can be later enabled with +.I poundctl +(8). .SH "Emergency" The emergency server will be used once all existing back-ends are "dead". All configuration directives enclosed between @@ -1129,7 +1208,7 @@ .SH "REPORTING BUGS" Report bugs to <roseg@apsis.ch>. .SH COPYRIGHT -Copyright \(co 2002-2006 Apsis GmbH. +Copyright \(co 2002-2010 Apsis GmbH. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch */ @@ -106,6 +105,68 @@ } /* + * work queue stuff + */ +static thr_arg *first = NULL, *last = NULL; +static pthread_cond_t arg_cond; +static pthread_mutex_t arg_mut; +int numthreads; + +static void +init_thr_arg(void) +{ + pthread_cond_init(&arg_cond, NULL); + pthread_mutex_init(&arg_mut, NULL); + return; +} + +/* + * add a request to the queue + */ +int +put_thr_arg(thr_arg *arg) +{ + thr_arg *res; + + if((res = malloc(sizeof(thr_arg))) == NULL) { + logmsg(LOG_WARNING, "thr_arg malloc"); + return -1; + } + memcpy(res, arg, sizeof(thr_arg)); + res->next = NULL; + (void)pthread_mutex_lock(&arg_mut); + if(last == NULL) + first = last = res; + else { + last->next = res; + last = last->next; + } + (void)pthread_mutex_unlock(&arg_mut); + pthread_cond_signal(&arg_cond); + return 0; +} + +/* + * get a request from the queue + */ +thr_arg * +get_thr_arg(void) +{ + thr_arg *res; + + (void)pthread_mutex_lock(&arg_mut); + if(first == NULL) + (void)pthread_cond_wait(&arg_cond, &arg_mut); + if((res = first) != NULL) + if((first = first->next) == NULL) + last = NULL; + (void)pthread_mutex_unlock(&arg_mut); + if(first != NULL) + pthread_cond_signal(&arg_cond); + return res; +} + +/* * handle SIGTERM/SIGQUIT - exit */ static RETSIGTYPE @@ -185,6 +246,7 @@ SSL_library_init(); OpenSSL_add_all_algorithms(); l_init(); + init_thr_arg(); CRYPTO_set_id_callback(l_id); CRYPTO_set_locking_callback(l_lock); init_timer(); @@ -195,7 +257,7 @@ || regcomp(&RESP_SKIP, "^HTTP/1.1 100.*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&RESP_IGN, "^HTTP/1.[01] (10[1-9]|1[1-9][0-9]|204|30[456]).*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED) || regcomp(&LOCATION, "(http|https)://([^/]+)(.*)", REG_ICASE | REG_NEWLINE | REG_EXTENDED) - || regcomp(&AUTHORIZATION, "Authorization:[ \t]*Basic[ \t]*([^ \t]*)[ \t]*", REG_ICASE | REG_NEWLINE | REG_EXTENDED) + || regcomp(&AUTHORIZATION, "Authorization:[ \t]*Basic[ \t]*\"?([^ \t]*)\"?[ \t]*", REG_ICASE | REG_NEWLINE | REG_EXTENDED) ) { logmsg(LOG_ERR, "bad essential Regex - aborted"); exit(1); @@ -377,7 +439,17 @@ } /* pause to make sure the service threads were started */ - sleep(2); + sleep(1); + + /* create the worker threads */ + for(i = 0; i < numthreads; i++) + if(pthread_create(&thr, &attr, thr_http, NULL)) { + logmsg(LOG_ERR, "create thr_http: %s - aborted", strerror(errno)); + exit(1); + } + + /* pause to make sure at least some of the worker threads were started */ + sleep(1); /* and start working */ for(;;) { @@ -409,7 +481,7 @@ logmsg(LOG_WARNING, "HTTP accept: %s", strerror(errno)); } else if(((struct sockaddr_in *)&clnt_addr)->sin_family == AF_INET || ((struct sockaddr_in *)&clnt_addr)->sin_family == AF_INET6) { - thr_arg *arg; + thr_arg arg; if(lstn->disabled) { /* @@ -418,30 +490,21 @@ */ close(clnt); } - if((arg = (thr_arg *)malloc(sizeof(thr_arg))) == NULL) { - logmsg(LOG_WARNING, "HTTP arg: malloc"); - close(clnt); - continue; - } - arg->sock = clnt; - arg->lstn = lstn; - if((arg->from_host.ai_addr = (struct sockaddr *)malloc(clnt_length)) == NULL) { + arg.sock = clnt; + arg.lstn = lstn; + if((arg.from_host.ai_addr = (struct sockaddr *)malloc(clnt_length)) == NULL) { logmsg(LOG_WARNING, "HTTP arg address: malloc"); - free(arg); + close(clnt); continue; } - memcpy(arg->from_host.ai_addr, &clnt_addr, clnt_length); - arg->from_host.ai_addrlen = clnt_length; + memcpy(arg.from_host.ai_addr, &clnt_addr, clnt_length); + arg.from_host.ai_addrlen = clnt_length; if(((struct sockaddr_in *)&clnt_addr)->sin_family == AF_INET) - arg->from_host.ai_family = AF_INET; + arg.from_host.ai_family = AF_INET; else - arg->from_host.ai_family = AF_INET6; - if(pthread_create(&thr, &attr, thr_http, (void *)arg)) { - logmsg(LOG_WARNING, "HTTP pthread_create: %s", strerror(errno)); - free(arg->from_host.ai_addr); - free(arg); + arg.from_host.ai_family = AF_INET6; + if(put_thr_arg(&arg)) close(clnt); - } } else { /* may happen on FreeBSD, I am told */ logmsg(LOG_WARNING, "HTTP connection prematurely closed by peer");

@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch */ @@ -180,10 +179,14 @@ #error "Pound needs signal.h" #endif +#if HAVE_LIBPCREPOSIX #if HAVE_PCREPOSIX_H #include <pcreposix.h> -#elif HAVE_PCRE_PCREPOSIX +#elif HAVE_PCRE_PCREPOSIX_H #include <pcre/pcreposix.h> +#else +#error "You have libpcreposix, but the header files are missing. Use --disable-pcreposix" +#endif #elif HAVE_REGEX_H #include <regex.h> #else @@ -228,10 +231,30 @@ #include <varargs.h> #endif +#if HAVE_FNMATCH_H +#include <fnmatch.h> +#else +#error "Pound needs fnmatch.h" +#endif + #ifndef __STDC__ #define const #endif +#ifdef HAVE_LONG_LONG_INT +#define LONG long long +#define L0 0LL +#define L_1 -1LL +#define STRTOL strtoll +#define ATOL atoll +#else +#define LONG long +#define L0 0L +#define L_1 -1L +#define STRTOL strtol +#define ATOL atol +#endif + #ifndef NO_EXTERNALS /* * Global variables needed by everybody @@ -243,7 +266,8 @@ *pid_name, /* file to record pid in */ *ctrl_name; /* control socket name */ -extern int alive_to, /* check interval for resurrection */ +extern int numthreads, /* number of worker threads */ + alive_to, /* check interval for resurrection */ daemonize, /* run as daemon */ log_facility, /* log facility to use */ print_log, /* print log messages to stdout/stderr */ @@ -292,10 +316,12 @@ int be_type; /* 0 if real back-end, otherwise code (301, 302/default, 307) */ struct addrinfo addr; /* IPv4/6 address */ int priority; /* priority */ - int to; + int to; /* read/write time-out */ + int conn_to; /* connection time-out */ struct addrinfo ha_addr; /* HA address/port */ char *url; /* for redirectors */ int redir_req; /* the redirect should include the request path */ + SSL_CTX *ctx; /* CTX for SSL connections */ pthread_mutex_t mut; /* mutex for this back-end */ int n_requests; /* number of requests seen */ double t_requests; /* time to answer these requests */ @@ -317,6 +343,10 @@ /* maximal session key size */ #define KEY_SIZE 127 +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +DECLARE_LHASH_OF(TABNODE); +#endif + /* service definition */ typedef struct _service { char name[KEY_SIZE + 1]; /* symbolic name */ @@ -330,9 +360,13 @@ pthread_mutex_t mut; /* mutex for this service */ SESS_TYPE sess_type; int sess_ttl; /* session time-to-live */ + regex_t sess_start; /* pattern to identify the session data */ regex_t sess_pat; /* pattern to match the session data */ - char *sess_parm; /* session cookie or parameter */ +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHASH_OF(TABNODE) *sessions; /* currently active sessions */ +#else LHASH *sessions; /* currently active sessions */ +#endif int dynscale; /* true if the back-ends should be dynamically rescaled */ int disabled; /* true if the service is disabled */ struct _service *next; @@ -342,28 +376,34 @@ extern SERVICE *services; /* global services (if any) */ #endif /* NO_EXTERNALS */ +typedef struct _pound_ctx { + SSL_CTX *ctx; + char *server_name; + struct _pound_ctx *next; +} POUND_CTX; + /* Listener definition */ typedef struct _listener { - struct addrinfo addr; /* IPv4/6 address */ - int sock; /* listening socket */ - SSL_CTX *ctx; /* CTX for SSL connections */ - int clnt_check; /* client verification mode */ - int noHTTPS11; /* HTTP 1.1 mode for SSL */ - char *add_head; /* extra SSL header */ - regex_t verb; /* pattern to match the request verb against */ - int to; /* client time-out */ - int has_pat; /* was a URL pattern defined? */ - regex_t url_pat; /* pattern to match the request URL against */ - char *err414, /* error messages */ + struct addrinfo addr; /* IPv4/6 address */ + int sock; /* listening socket */ + POUND_CTX *ctx; /* CTX for SSL connections */ + int clnt_check; /* client verification mode */ + int noHTTPS11; /* HTTP 1.1 mode for SSL */ + char *add_head; /* extra SSL header */ + regex_t verb; /* pattern to match the request verb against */ + int to; /* client time-out */ + int has_pat; /* was a URL pattern defined? */ + regex_t url_pat; /* pattern to match the request URL against */ + char *err414, /* error messages */ *err500, *err501, *err503; - long max_req; /* max. request size */ - MATCHER *head_off; /* headers to remove */ - int rewr_loc; /* rewrite location response */ - int rewr_dest; /* rewrite destination header */ - int disabled; /* true if the listener is disabled */ - int log_level; /* log level for this listener */ + LONG max_req; /* max. request size */ + MATCHER *head_off; /* headers to remove */ + int rewr_loc; /* rewrite location response */ + int rewr_dest; /* rewrite destination header */ + int disabled; /* true if the listener is disabled */ + int log_level; /* log level for this listener */ SERVICE *services; struct _listener *next; } LISTENER; @@ -372,10 +412,11 @@ extern LISTENER *listeners; /* all available listeners */ #endif /* NO_EXTERNALS */ -typedef struct { +typedef struct _thr_arg { int sock; LISTENER *lstn; struct addrinfo from_host; + struct _thr_arg *next; } thr_arg; /* argument to processing threads: socket, origin */ /* Header types */ @@ -425,6 +466,16 @@ #endif /* + * add a request to the queue + */ +extern int put_thr_arg(thr_arg *); + +/* + * get a request from the queue + */ +extern thr_arg *get_thr_arg(void); + +/* * handle an HTTP request */ extern void *thr_http(void *); @@ -435,6 +486,11 @@ extern void logmsg(const int, const char *, ...); /* + * Parse a URL, possibly decoding hexadecimal-encoded characters + */ +extern int cpURL(char *, char *, int); + +/* * Translate inet/inet6 address into a string */ extern void addr2str(char *, const int, const struct addrinfo *, const int); @@ -465,7 +521,7 @@ * (1) if the redirect was done to the correct location with the wrong protocol * (2) if the redirect was done to the back-end rather than the listener */ -extern int need_rewrite(const int, char *const, char *const, const LISTENER *, const BACKEND *); +extern int need_rewrite(const int, char *const, char *const, const char *, const LISTENER *, const BACKEND *); /* * (for cookies only) possibly create session based on response headers */ @@ -530,6 +586,11 @@ extern RSA *RSA_tmp_callback(SSL *, int, int); /* + * return a pre-generated RSA key + */ +extern DH *DH_tmp_callback(SSL *, int, int); + +/* * expiration stuff */ #ifndef EXPIRE_TO

@@ -1,9 +1,9 @@ -.TH POUNDCTL "8" "October 2006" "poundctl" "System Manager's Manual" +.TH POUNDCTL "8" "Jan 2010" "poundctl" "System Manager's Manual" .SH NAME poundctl \- control the pound(8) daemon .SH SYNOPSIS .TP -.B poundctl \fI-c /path/to/socket\fR [\fI-L/-l\fR] [\fI-S/-s\fR] [\fI-B/-b\fR] [\fI-N/-n\fR] +.B poundctl \fI-c /path/to/socket\fR [\fI-L/-l\fR] [\fI-S/-s\fR] [\fI-B/-b\fR] [\fI-N/-n\fR] [\fI-H\fR] [\fI-X\fR] .SH DESCRIPTION .PP .B Poundctl @@ -48,6 +48,13 @@ The parameters n, m and r refer to the number assigned to a particular listener, service and back-end in the listings. A listener number of -1 refers by convention to the global context. +.TP +\fB\-H\fR +Try to resolve the addresses to symbolic names. Depending on your configuration, +this may require an active DNS. +.TP +\fB\-X\fR +Show the results in XML format. .PP When called without flags .B poundctl @@ -59,7 +66,7 @@ .SH "REPORTING BUGS" Report bugs to <roseg@apsis.ch>. .SH COPYRIGHT -Copyright \(co 2002-2006 Apsis GmbH. +Copyright \(co 2002-2010 Apsis GmbH. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,13 +22,13 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch */ #define NO_EXTERNALS 1 #include "pound.h" static int xml_out = 0; +static int host_names = 0; static void usage(const char *arg0) @@ -45,7 +45,8 @@ fprintf(stderr, "\t-n n m k - remove a session with key k r in service m in listener n\n"); fprintf(stderr, "\n"); fprintf(stderr, "\tentering the command without arguments lists the current configuration.\n"); - fprintf(stderr, "\tthe -X flags results in XML output.\n"); + fprintf(stderr, "\tthe -X flag results in XML output.\n"); + fprintf(stderr, "\tthe -H flag shows symbolic host names instead of addresses.\n"); exit(1); } @@ -66,12 +67,16 @@ case AF_INET: src = (void *)&((struct sockaddr_in *)addr->ai_addr)->sin_addr.s_addr; port = ntohs(((struct sockaddr_in *)addr->ai_addr)->sin_port); + if(host_names && !getnameinfo(addr->ai_addr, addr->ai_addrlen, buf, UNIX_PATH_MAX - 1, NULL, 0, 0)) + break; if(inet_ntop(AF_INET, src, buf, UNIX_PATH_MAX - 1) == NULL) strncpy(buf, "(UNKNOWN)", UNIX_PATH_MAX - 1); break; case AF_INET6: src = (void *)&((struct sockaddr_in6 *)addr->ai_addr)->sin6_addr.s6_addr; port = ntohs(((struct sockaddr_in6 *)addr->ai_addr)->sin6_port); + if(host_names && !getnameinfo(addr->ai_addr, addr->ai_addrlen, buf, UNIX_PATH_MAX - 1, NULL, 0, 0)) + break; if(inet_ntop(AF_INET6, src, buf, UNIX_PATH_MAX - 1) == NULL) strncpy(buf, "(UNKNOWN)", UNIX_PATH_MAX - 1); break; @@ -109,9 +114,10 @@ be.ha_addr.ai_addr = (struct sockaddr *)&h; } if(xml_out) - printf("<backend index=\"%d\" address=\"%s\" average=\"%.3f\" priority=\"%d\"%s%s />\n", n_be++, - prt_addr(&be.addr), be.t_average / 1000000, be.priority, be.alive? "": " DEAD", - be.disabled? " DISABLED": ""); + printf("<backend index=\"%d\" address=\"%s\" avg=\"%.3f\" priority=\"%d\" alive=\"%s\" status=\"%s\" />\n", + n_be++, + prt_addr(&be.addr), be.t_average / 1000000, be.priority, be.alive? "yes": "DEAD", + be.disabled? "DISABLED": "active"); else printf(" %3d. Backend %s %s (%d %.3f sec) %s\n", n_be++, prt_addr(&be.addr), be.disabled? "DISABLED": "active", be.priority, be.t_average / 1000000, be.alive? "alive": "DEAD"); @@ -165,7 +171,8 @@ break; if(xml_out) { if(svc.name[0]) - printf("<service index=\"%d\" name=\"%s\"%s>\n", n_svc++, svc.name, svc.disabled? " DISABLED": ""); + printf("<service index=\"%d\" name=\"%s\" status=\"%s\">\n", + n_svc++, svc.name, svc.disabled? "DISABLED": "active"); else printf("<service index=\"%d\"%s>\n", n_svc++, svc.disabled? " DISABLED": ""); } else { @@ -203,6 +210,7 @@ return res; } +int main(const int argc, char **argv) { CTRL_CMD cmd; @@ -221,7 +229,7 @@ memset(&cmd, 0, sizeof(cmd)); opterr = 0; i = 0; - while(!i && (c_opt = getopt(argc, argv, "c:LlSsBbNnX")) > 0) + while(!i && (c_opt = getopt(argc, argv, "c:LlSsBbNnXH")) > 0) switch(c_opt) { case 'c': sock_name = optarg; @@ -269,6 +277,9 @@ usage(arg0); d_sess = is_set = 1; break; + case 'H': + host_names = 1; + break; default: if(optopt == '1') { optind--; @@ -340,8 +351,9 @@ read(sock, &a, lstn.addr.ai_addrlen); lstn.addr.ai_addr = (struct sockaddr *)&a; if(xml_out) - printf("<listener index=\"%d\" %s address=\"%s\"%s>\n", n_lstn++, lstn.ctx? "HTTPS": "HTTP", - prt_addr(&lstn.addr), lstn.disabled? " DISABLED": ""); + printf("<listener index=\"%d\" protocol=\"%s\" address=\"%s\" status=\"%s\">\n", + n_lstn++, lstn.ctx? "HTTPS": "http", + prt_addr(&lstn.addr), lstn.disabled? "DISABLED": "active"); else printf("%3d. %s Listener %s %s\n", n_lstn++, lstn.ctx? "HTTPS" : "http", prt_addr(&lstn.addr), lstn.disabled? "*D": "a");

@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,18 +22,22 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch */ #include "pound.h" +#ifndef LHASH_OF +#define LHASH_OF(x) LHASH +#define CHECKED_LHASH_OF(type, h) h +#endif + /* * Add a new key/content pair to a hash table * the table should be already locked */ static void -t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len) +t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len) { TABNODE *t, *old; @@ -54,7 +58,11 @@ } memcpy(t->content, content, cont_len); t->last_acc = time(NULL); +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) { +#else if((old = (TABNODE *)lh_insert(tab, t)) != NULL) { +#endif free(old->key); free(old->content); free(old); @@ -69,7 +77,7 @@ * side-effect: update the time of last access */ static void * -t_find(LHASH *const tab, char *const key) +t_find(LHASH_OF(TABNODE) *const tab, char *const key) { TABNODE t, *res; @@ -85,12 +93,16 @@ * Delete a key */ static void -t_remove(LHASH *const tab, char *const key) +t_remove(LHASH_OF(TABNODE) *const tab, char *const key) { TABNODE t, *res; t.key = key; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) { +#else if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) { +#endif free(res->key); free(res->content); free(res); @@ -99,59 +111,87 @@ } typedef struct { - LHASH *tab; - time_t lim; - void *content; - int cont_len; + LHASH_OF(TABNODE) *tab; + time_t lim; + void *content; + int cont_len; } ALL_ARG; static void -t_old(TABNODE *t, void *arg) +t_old_doall_arg(TABNODE *t, ALL_ARG *a) { - ALL_ARG *a; + TABNODE *res; - a = (ALL_ARG *)arg; if(t->last_acc < a->lim) - lh_delete(a->tab, t); +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, a->tab, t)) != NULL) { +#else + if((res = lh_delete(a->tab, t)) != NULL) { +#endif + free(res->key); + free(res->content); + free(res); + } return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG) +#else +#define t_old t_old_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *) +#endif /* * Expire all old nodes */ static void -t_expire(LHASH *const tab, const time_t lim) +t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim) { ALL_ARG a; int down_load; a.tab = tab; a.lim = lim; - down_load = tab->down_load; - tab->down_load = 0; + down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; + CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a); +#else lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a); - tab->down_load = down_load; +#endif + CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; return; } static void -t_cont(TABNODE *t, void *arg) +t_cont_doall_arg(TABNODE *t, ALL_ARG *arg) { - ALL_ARG *a; + TABNODE *res; - a = (ALL_ARG *)arg; - if(memcmp(t->content, a->content, a->cont_len) == 0) - lh_delete(a->tab, t); + if(memcmp(t->content, arg->content, arg->cont_len) == 0) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, arg->tab, t)) != NULL) { +#else + if((res = lh_delete(arg->tab, t)) != NULL) { +#endif + free(res->key); + free(res->content); + free(res); + } return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG) +#else +#define t_cont t_cont_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *) +#endif /* * Remove all nodes with the given content */ static void -t_clean(LHASH *const tab, void *const content, const size_t cont_len) +t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len) { ALL_ARG a; int down_load; @@ -159,10 +199,14 @@ a.tab = tab; a.content = content; a.cont_len = cont_len; - down_load = tab->down_load; - tab->down_load = 0; + down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; + CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a); +#else lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a); - tab->down_load = down_load; +#endif + CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; return; } @@ -261,6 +305,70 @@ } /* + * Parse a URL, possibly decoding hexadecimal-encoded characters + */ +int +cpURL(char *res, char *src, int len) +{ + int state; + char *kp_res; + + for(kp_res = res, state = 0; len > 0; len--) + switch(state) { + case 1: + if(*src >= '0' && *src <= '9') { + *res = *src++ - '0'; + state = 2; + } else if(*src >= 'A' && *src <= 'F') { + *res = *src++ - 'A' + 10; + state = 2; + } else if(*src >= 'a' && *src <= 'f') { + *res = *src++ - 'a' + 10; + state = 2; + } else { + *res++ = '%'; + *res++ = *src++; + state = 0; + } + break; + case 2: + if(*src >= '0' && *src <= '9') { + *res = *res * 16 + *src++ - '0'; + res++; + state = 0; + } else if(*src >= 'A' && *src <= 'F') { + *res = *res * 16 + *src++ - 'A' + 10; + res++; + state = 0; + } else if(*src >= 'a' && *src <= 'f') { + *res = *res * 16 + *src++ - 'a' + 10; + res++; + state = 0; + } else { + *res++ = '%'; + *res++ = *(src - 1); + *res++ = *src++; + state = 0; + } + break; + default: + if(*src != '%') + *res++ = *src++; + else { + src++; + state = 1; + } + break; + } + if(state > 0) + *res++ = '%'; + if(state > 1) + *res++ = *(src - 1); + *res = '\0'; + return res - kp_res; +} + +/* * Parse a header * return a code and possibly content in the arg */ @@ -368,16 +476,21 @@ static int get_REQUEST(char *res, const SERVICE *svc, const char *request) { - int n; + int n, s; regmatch_t matches[4]; - if(regexec(&svc->sess_pat, request, 4, matches, 0)) { + if(regexec(&svc->sess_start, request, 4, matches, 0)) { + res[0] = '\0'; + return 0; + } + s = matches[0].rm_eo; + if(regexec(&svc->sess_pat, request + s, 4, matches, 0)) { res[0] = '\0'; return 0; } if((n = matches[1].rm_eo - matches[1].rm_so) > KEY_SIZE) n = KEY_SIZE; - strncpy(res, request + matches[1].rm_so, n); + strncpy(res, request + s + matches[1].rm_so, n); res[n] = '\0'; return 1; } @@ -385,7 +498,7 @@ static int get_HEADERS(char *res, const SERVICE *svc, char **const headers) { - int i, n; + int i, n, s; regmatch_t matches[4]; /* this will match SESS_COOKIE, SESS_HEADER and SESS_BASIC */ @@ -393,11 +506,14 @@ for(i = 0; i < (MAXHEADERS - 1); i++) { if(headers[i] == NULL) continue; - if(regexec(&svc->sess_pat, headers[i], 4, matches, 0)) + if(regexec(&svc->sess_start, headers[i], 4, matches, 0)) + continue; + s = matches[0].rm_eo; + if(regexec(&svc->sess_pat, headers[i] + s, 4, matches, 0)) continue; if((n = matches[1].rm_eo - matches[1].rm_so) > KEY_SIZE) n = KEY_SIZE; - strncpy(res, headers[i] + matches[1].rm_so, n); + strncpy(res, headers[i] + s + matches[1].rm_so, n); res[n] = '\0'; } return res[0] != '\0'; @@ -437,7 +553,7 @@ hv = 2166136261; while(*key) - hv = (hv ^ *key++) * 16777619; + hv = ((hv ^ *key++) * 16777619) & 0xFFFFFFFF; pri = hv % abs_pri; for(tb = be; tb; tb = tb->next) if((pri -= tb->priority) < 0) @@ -464,28 +580,31 @@ { BACKEND *res; char key[KEY_SIZE + 1]; - int ret_val; + int ret_val, no_be; void *vp; - if(svc->tot_pri <= 0) - /* it might be NULL, but that is OK */ - return svc->emergency; - if(ret_val = pthread_mutex_lock(&svc->mut)) logmsg(LOG_WARNING, "get_backend() lock: %s", strerror(ret_val)); + + no_be = (svc->tot_pri <= 0); + switch(svc->sess_type) { case SESS_NONE: /* choose one back-end randomly */ - res = rand_backend(svc->backends, random() % svc->tot_pri); + res = no_be? svc->emergency: rand_backend(svc->backends, random() % svc->tot_pri); break; case SESS_IP: addr2str(key, KEY_SIZE, from_host, 1); if(svc->sess_ttl < 0) - res = hash_backend(svc->backends, svc->abs_pri, key); + res = no_be? svc->emergency: hash_backend(svc->backends, svc->abs_pri, key); else if((vp = t_find(svc->sessions, key)) == NULL) { - /* no session yet - create one */ - res = rand_backend(svc->backends, random() % svc->tot_pri); - t_add(svc->sessions, key, &res, sizeof(res)); + if(no_be) + res = svc->emergency; + else { + /* no session yet - create one */ + res = rand_backend(svc->backends, random() % svc->tot_pri); + t_add(svc->sessions, key, &res, sizeof(res)); + } } else memcpy(&res, vp, sizeof(res)); break; @@ -493,30 +612,38 @@ case SESS_PARM: if(get_REQUEST(key, svc, request)) { if(svc->sess_ttl < 0) - res = hash_backend(svc->backends, svc->abs_pri, key); + res = no_be? svc->emergency: hash_backend(svc->backends, svc->abs_pri, key); else if((vp = t_find(svc->sessions, key)) == NULL) { - /* no session yet - create one */ - res = rand_backend(svc->backends, random() % svc->tot_pri); - t_add(svc->sessions, key, &res, sizeof(res)); + if(no_be) + res = svc->emergency; + else { + /* no session yet - create one */ + res = rand_backend(svc->backends, random() % svc->tot_pri); + t_add(svc->sessions, key, &res, sizeof(res)); + } } else memcpy(&res, vp, sizeof(res)); } else { - res = rand_backend(svc->backends, random() % svc->tot_pri); + res = no_be? svc->emergency: rand_backend(svc->backends, random() % svc->tot_pri); } break; default: /* this works for SESS_BASIC, SESS_HEADER and SESS_COOKIE */ if(get_HEADERS(key, svc, headers)) { if(svc->sess_ttl < 0) - res = hash_backend(svc->backends, svc->abs_pri, key); + res = no_be? svc->emergency: hash_backend(svc->backends, svc->abs_pri, key); else if((vp = t_find(svc->sessions, key)) == NULL) { - /* no session yet - create one */ - res = rand_backend(svc->backends, random() % svc->tot_pri); - t_add(svc->sessions, key, &res, sizeof(res)); + if(no_be) + res = svc->emergency; + else { + /* no session yet - create one */ + res = rand_backend(svc->backends, random() % svc->tot_pri); + t_add(svc->sessions, key, &res, sizeof(res)); + } } else memcpy(&res, vp, sizeof(res)); } else { - res = rand_backend(svc->backends, random() % svc->tot_pri); + res = no_be? svc->emergency: rand_backend(svc->backends, random() % svc->tot_pri); } break; } @@ -549,7 +676,7 @@ /* * mark a backend host as dead/disabled; remove its sessions if necessary - * disable_only == 1: mark as disabled, remove sessions + * disable_only == 1: mark as disabled * disable_only == 0: mark as dead, remove sessions * disable_only == -1: mark as enabled */ @@ -634,9 +761,13 @@ hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; if((ret_val = getaddrinfo(name, NULL, &hints, &chain)) == 0) { +#ifdef _AIX + ap = chain; +#else for(ap = chain; ap != NULL; ap = ap->ai_next) if(ap->ai_socktype == SOCK_STREAM) break; +#endif if(ap == NULL) { freeaddrinfo(chain); return EAI_NONAME; @@ -662,13 +793,13 @@ * (2) if the redirect was done to the back-end rather than the listener */ int -need_rewrite(const int rewr_loc, char *const location, char *const path, const LISTENER *lstn, const BACKEND *be) +need_rewrite(const int rewr_loc, char *const location, char *const path, const char *v_host, const LISTENER *lstn, const BACKEND *be) { struct addrinfo addr; struct sockaddr_in in_addr, be_addr; struct sockaddr_in6 in6_addr, be6_addr; regmatch_t matches[4]; - char *proto, *host, *port; + char *proto, *host, *port, *cp, buf[MAXBUF]; int ret_val; /* check if rewriting is required at all */ @@ -706,37 +837,31 @@ free(addr.ai_addr); return 0; } + memset(buf, '\0', MAXBUF); + strncpy(buf, v_host, MAXBUF - 1); + if((cp = strchr(buf, ':')) != NULL) + *cp = '\0'; if(addr.ai_family == AF_INET) { - memcpy(&in_addr, addr.ai_addr, sizeof(in_addr)); - memcpy(&be_addr, be->addr.ai_addr, sizeof(be_addr)); - if(port) - in_addr.sin_port = (in_port_t)htons(atoi(port)); - else if(!strcasecmp(proto, "https")) - in_addr.sin_port = (in_port_t)htons(443); - else - in_addr.sin_port = (in_port_t)htons(80); /* - * check if the Location points to the back-end + * check if the Location points to the Listener but with the wrong port or protocol */ - if(memcmp(&be_addr.sin_addr.s_addr, &in_addr.sin_addr.s_addr, sizeof(in_addr.sin_addr.s_addr)) == 0 - && memcmp(&be_addr.sin_port, &in_addr.sin_port, sizeof(in_addr.sin_port)) == 0) { + memcpy(&be_addr, lstn->addr.ai_addr, sizeof(be_addr)); + if((memcmp(&be_addr.sin_addr.s_addr, &in_addr.sin_addr.s_addr, sizeof(in_addr.sin_addr.s_addr)) == 0 + || strcasecmp(host, buf) == 0) + && (memcmp(&be_addr.sin_port, &in_addr.sin_port, sizeof(in_addr.sin_port)) != 0 + || strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { free(addr.ai_addr); return 1; } - } else { - memcpy(&in6_addr, addr.ai_addr, sizeof(in6_addr)); - memcpy(&be6_addr, be->addr.ai_addr, sizeof(be6_addr)); - if(port) - in6_addr.sin6_port = (in_port_t)htons(atoi(port)); - else if(!strcasecmp(proto, "https")) - in6_addr.sin6_port = (in_port_t)htons(443); - else - in6_addr.sin6_port = (in_port_t)htons(80); + } else /* AF_INET6 */ { /* - * check if the Location points to the back-end + * check if the Location points to the Listener but with the wrong port or protocol */ - if(memcmp(&be6_addr.sin6_addr.s6_addr, &in6_addr.sin6_addr.s6_addr, sizeof(in6_addr.sin6_addr.s6_addr)) == 0 - && memcmp(&be6_addr.sin6_port, &in6_addr.sin6_port, sizeof(in6_addr.sin6_port)) == 0) { + memcpy(&be6_addr, lstn->addr.ai_addr, sizeof(be6_addr)); + if((memcmp(&be6_addr.sin6_addr.s6_addr, &in6_addr.sin6_addr.s6_addr, sizeof(in6_addr.sin6_addr.s6_addr)) == 0 + || strcasecmp(host, buf) == 0) + && (memcmp(&be6_addr.sin6_port, &in6_addr.sin6_port, sizeof(in6_addr.sin6_port)) != 0 + || strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { free(addr.ai_addr); return 1; } @@ -757,7 +882,7 @@ */ if(memcmp(&be_addr.sin_addr.s_addr, &in_addr.sin_addr.s_addr, sizeof(in_addr.sin_addr.s_addr)) == 0 && (memcmp(&be_addr.sin_port, &in_addr.sin_port, sizeof(in_addr.sin_port)) != 0 - || strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { + || strcasecmp(proto, lstn->ctx? "http": "https"))) { free(addr.ai_addr); return 1; } @@ -769,7 +894,7 @@ */ if(memcmp(&be6_addr.sin6_addr.s6_addr, &in6_addr.sin6_addr.s6_addr, sizeof(in6_addr.sin6_addr.s6_addr)) == 0 && (memcmp(&be6_addr.sin6_port, &in6_addr.sin6_port, sizeof(in6_addr.sin6_port)) != 0 - || strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { + || strcasecmp(proto, lstn->ctx? "http": "https"))) { free(addr.ai_addr); return 1; } @@ -897,7 +1022,7 @@ default: continue; } - if(connect_nb(sock, &be->ha_addr, be->to) != 0) { + if(connect_nb(sock, &be->ha_addr, be->conn_to) != 0) { kill_be(svc, be, BE_KILL); str_be(buf, MAXBUF - 1, be); logmsg(LOG_NOTICE, "BackEnd %s is dead (HA)", buf); @@ -933,7 +1058,7 @@ default: continue; } - if(connect_nb(sock, &be->ha_addr, be->to) != 0) { + if(connect_nb(sock, &be->ha_addr, be->conn_to) != 0) { kill_be(svc, be, BE_KILL); str_be(buf, MAXBUF - 1, be); logmsg(LOG_NOTICE, "BackEnd %s is dead (HA)", buf); @@ -988,7 +1113,7 @@ } addr = &be->ha_addr; } - if(connect_nb(sock, addr, be->to) == 0) { + if(connect_nb(sock, addr, be->conn_to) == 0) { be->resurrect = 1; modified = 1; } @@ -1057,7 +1182,7 @@ } addr = &be->ha_addr; } - if(connect_nb(sock, addr, be->to) == 0) { + if(connect_nb(sock, addr, be->conn_to) == 0) { be->resurrect = 1; modified = 1; } @@ -1289,20 +1414,37 @@ do_RSAgen(void) { int n, ret_val; + RSA *t_RSA512_keys[N_RSA_KEYS]; + RSA *t_RSA1024_keys[N_RSA_KEYS]; + for(n = 0; n < N_RSA_KEYS; n++) { + t_RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL); + t_RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL); + } if(ret_val = pthread_mutex_lock(&RSA_mut)) logmsg(LOG_WARNING, "thr_RSAgen() lock: %s", strerror(ret_val)); for(n = 0; n < N_RSA_KEYS; n++) { RSA_free(RSA512_keys[n]); - RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL); + RSA512_keys[n] = t_RSA512_keys[n]; RSA_free(RSA1024_keys[n]); - RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL); + RSA1024_keys[n] = t_RSA1024_keys[n]; } if(ret_val = pthread_mutex_unlock(&RSA_mut)) logmsg(LOG_WARNING, "thr_RSAgen() unlock: %s", strerror(ret_val)); return; } +#include "dh512.h" +#include "dh1024.h" + +static DH *DH512_params, *DH1024_params; + +DH * +DH_tmp_callback(/* not used */SSL *s, /* not used */int is_export, int keylength) +{ + return keylength == 512? DH512_params: DH1024_params; +} + static time_t last_RSA, last_rescale, last_alive, last_expire; /* @@ -1332,6 +1474,9 @@ /* pthread_mutex_init() always returns 0 */ pthread_mutex_init(&RSA_mut, NULL); + DH512_params = get_dh512(); + DH1024_params = get_dh1024(); + return; } @@ -1385,41 +1530,47 @@ } DUMP_ARG; static void -t_dump(TABNODE *t, void *arg) +t_dump_doall_arg(TABNODE *t, DUMP_ARG *arg) { - DUMP_ARG *a; BACKEND *be, *bep; int n_be, sz; - a = (DUMP_ARG *)arg; memcpy(&bep, t->content, sizeof(bep)); - for(n_be = 0, be = a->backends; be; be = be->next, n_be++) + for(n_be = 0, be = arg->backends; be; be = be->next, n_be++) if(be == bep) break; if(!be) /* should NEVER happen */ n_be = 0; - write(a->control_sock, t, sizeof(TABNODE)); - write(a->control_sock, &n_be, sizeof(n_be)); + (void)write(arg->control_sock, t, sizeof(TABNODE)); + (void)write(arg->control_sock, &n_be, sizeof(n_be)); sz = strlen(t->key); - write(a->control_sock, &sz, sizeof(sz)); - write(a->control_sock, t->key, sz); + (void)write(arg->control_sock, &sz, sizeof(sz)); + (void)write(arg->control_sock, t->key, sz); return; } - -IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG) +#else +#define t_dump t_dump_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *) +#endif /* * write sessions to the control socket */ static void -dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends) +dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends) { DUMP_ARG a; a.control_sock = control_sock; a.backends = backends; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a); +#else lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a); +#endif return; } @@ -1526,17 +1677,17 @@ case CTRL_LST: /* logmsg(LOG_INFO, "thr_control() list"); */ for(lstn = listeners; lstn; lstn = lstn->next) { - write(ctl, (void *)lstn, sizeof(LISTENER)); - write(ctl, lstn->addr.ai_addr, lstn->addr.ai_addrlen); + (void)write(ctl, (void *)lstn, sizeof(LISTENER)); + (void)write(ctl, lstn->addr.ai_addr, lstn->addr.ai_addrlen); for(svc = lstn->services; svc; svc = svc->next) { - write(ctl, (void *)svc, sizeof(SERVICE)); + (void)write(ctl, (void *)svc, sizeof(SERVICE)); for(be = svc->backends; be; be = be->next) { - write(ctl, (void *)be, sizeof(BACKEND)); - write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); + (void)write(ctl, (void *)be, sizeof(BACKEND)); + (void)write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); if(be->ha_addr.ai_addrlen > 0) - write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); + (void)write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); } - write(ctl, (void *)&dummy_be, sizeof(BACKEND)); + (void)write(ctl, (void *)&dummy_be, sizeof(BACKEND)); if(dummy = pthread_mutex_lock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() lock: %s", strerror(dummy)); else { @@ -1544,20 +1695,20 @@ if(dummy = pthread_mutex_unlock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() unlock: %s", strerror(dummy)); } - write(ctl, (void *)&dummy_sess, sizeof(TABNODE)); + (void)write(ctl, (void *)&dummy_sess, sizeof(TABNODE)); } - write(ctl, (void *)&dummy_svc, sizeof(SERVICE)); + (void)write(ctl, (void *)&dummy_svc, sizeof(SERVICE)); } - write(ctl, (void *)&dummy_lstn, sizeof(LISTENER)); + (void)write(ctl, (void *)&dummy_lstn, sizeof(LISTENER)); for(svc = services; svc; svc = svc->next) { - write(ctl, (void *)svc, sizeof(SERVICE)); + (void)write(ctl, (void *)svc, sizeof(SERVICE)); for(be = svc->backends; be; be = be->next) { - write(ctl, (void *)be, sizeof(BACKEND)); - write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); + (void)write(ctl, (void *)be, sizeof(BACKEND)); + (void)write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); if(be->ha_addr.ai_addrlen > 0) - write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); + (void)write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); } - write(ctl, (void *)&dummy_be, sizeof(BACKEND)); + (void)write(ctl, (void *)&dummy_be, sizeof(BACKEND)); if(dummy = pthread_mutex_lock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() lock: %s", strerror(dummy)); else { @@ -1565,9 +1716,9 @@ if(dummy = pthread_mutex_unlock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() unlock: %s", strerror(dummy)); } - write(ctl, (void *)&dummy_sess, sizeof(TABNODE)); + (void)write(ctl, (void *)&dummy_sess, sizeof(TABNODE)); } - write(ctl, (void *)&dummy_svc, sizeof(SERVICE)); + (void)write(ctl, (void *)&dummy_svc, sizeof(SERVICE)); break; case CTRL_EN_LSTN: if((lstn = sel_lstn(&cmd)) == NULL)

@@ -0,0 +1,72 @@ +#! /bin/sh +# Copyright (c) 1995-1998 SuSE GmbH Nuernberg, Germany. +# +# Author: adrian@suse.de, template by ro@suse.de +# +# /etc/init.d/pound +# and its symbolic link +# /usr/sbin/rcpound +# +### BEGIN INIT INFO +# Provides: pound +# Required-Start: $time $remote_fs $named $syslog +# Required-Stop: $null +# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 +# Description: A lightweight HTTP proxy +# Short-Description: A lightweight HTTP proxy +### END INIT INFO + +. /etc/rc.status + + +# Determine the base and follow a runlevel link name. +base=${0##*/} +link=${base#*[SK][0-9][0-9]} + +# Force execution if not called by a runlevel directory. +test -x /usr/sbin/pound || exit 0 + +rc_reset +case "$1" in + start) + echo -n "Starting Pound HTTP Proxy" + startproc /usr/sbin/pound + rc_status -v + ;; + stop) + echo -n "Shutting down Pound HTTP Proxy" + killproc -TERM /usr/sbin/pound + rc_status -v + ;; + restart) + ## If first returns OK call the second, if first or + ## second command fails, set echo return value. + $0 stop && $0 start + rc_status + ;; + force-reload) + ## If first returns OK call the second, if first or + ## second command fails, set echo return value. + $0 stop; sleep 1 && $0 start + rc_status + ;; + reload) + $0 stop; sleep 1 && $0 start + rc_status + ;; + status) + echo -n "Checking for Pound HTTP Proxy Daemon: " + checkproc /usr/sbin/pound + rc_status -v + ;; + configtest) + echo "Checking Pound configuration ..." + eval /usr/sbin/pound -c + ;; + *) + echo "Usage: $0 {start|stop|status|restart|reload|configtest}" + exit 1 + ;; +esac +rc_exit

[-] [+]	Changed	Pound.spec
@@ -3,8 +3,8 @@ %define pound_home %{_localstatedir}/lib/pound Name: Pound -Version: 2.5 -Release: 1%{?dist} +Version: 2.6 +Release: 2%{?dist} Summary: Reverse proxy and load balancer Group: System Environment/Daemons @@ -15,9 +15,9 @@ BuildRequires: openssl-devel, pcre-devel -# tcmalloc doesn't exist on ppc yet (#238390) +# tcmalloc doesn't exist on ppc64 yet (#238390) # or sparc arches -%ifnarch ppc ppc64 sparcv9 sparc64 +%ifnarch ppc64 sparcv9 sparc64 %{?rhel:x86_64} BuildRequires: google-perftools-devel %endif @@ -116,8 +116,29 @@ %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home} %changelog -* Sat Nov 20 2010 Carsten Schoene <cs@linux-administrator.com> - 2.5-1 -- update to release 2.5 +* Wed May 30 2012 Manuel Wolfshant < wolfy@fedoraproject.org> 2.6-2 +- Rebuild with new gperftools + +* Mon Jan 09 2012 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.6-1 +- Upstream released new version + +* Mon Nov 22 2010 Lubomir Rintel (GoodData) <lubo.rintel@gooddata.com> - 2.5-1.1 +- Still no tmalloc in el6/x86_64 + +* Wed Feb 10 2010 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.5-1 +- Upstream released new version + +* Wed Nov 11 2009 Lubomir Rintel (GoodData) <lubo.rintel@gooddata.com> - 2.4.5-1 +- Rebased to new upstream release + +* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> - 2.4.4-4 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu Jan 15 2009 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.4.4-1 - upstream released new version
[-] [+]	Added	pound.diff ^
@@ -0,0 +1,18 @@ +--- Makefile.in ++++ Makefile.in +@@ -50,11 +50,11 @@ + + install: all + @INSTALL@ -d ${DESTDIR}@sbindir@ +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 pound ${DESTDIR}@sbindir@/pound +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 poundctl ${DESTDIR}@sbindir@/poundctl ++ @INSTALL@ -m 555 pound ${DESTDIR}@sbindir@/pound ++ @INSTALL@ -m 755 poundctl ${DESTDIR}@sbindir@/poundctl + @INSTALL@ -d ${DESTDIR}@mandir@/man8 +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8 +- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8 ++ @INSTALL@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8 ++ @INSTALL@ -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8 + + clean: + rm -f pound $(OBJS) poundctl poundctl.o
	Deleted	Pound-2.5.tgz ^
[-] [+]	Changed	Pound-2.6.tgz/CHANGELOG ^
@@ -1,4 +1,165 @@ ------------------------------------------------------------------------ +r74 \| roseg \| 2011-12-28 14:57:45 +0100 (Wed, 28 Dec 2011) \| 10 lines + +Release 2.6 + +Enhancements: + - allow multiple AddHeader directives + +Bug fixes: + - fixed memory leak in config/AddHeader + - removed call to AC_FUNC_MALLOC for AIX compatability + - workaround for AIX getaddrinfo() bug + +------------------------------------------------------------------------ +r73 \| roseg \| 2011-06-24 17:59:41 +0200 (Fri, 24 Jun 2011) \| 7 lines + +Release 2.6f + +Enhancements: + +Bug fixes: + - fixed memory leak in DH (patch by Edvin Torok via Patrizio Tassone) + +------------------------------------------------------------------------ +r72 \| roseg \| 2011-04-25 11:10:45 +0200 (Mon, 25 Apr 2011) \| 8 lines + +Release 2.6e + +Enhancements: + +Bug fixes: + - fixed problem in SNI certificate storage + - changed long to long long for support of requests larger than 2GB + +------------------------------------------------------------------------ +r71 \| roseg \| 2011-04-11 15:59:05 +0200 (Mon, 11 Apr 2011) \| 9 lines + +Release 2.6d + +Enhancements: + - added parsing for certificate CN + +Bug fixes: + - fixed problem in task enqueing + - fixed small problem in Makefile + +------------------------------------------------------------------------ +r70 \| roseg \| 2010-12-27 17:54:18 +0100 (Mon, 27 Dec 2010) \| 14 lines + +Release 2.6c + +Enhancements: + - added support for OpenSSL 1.0 + - added some more detailed error logging + +Bug fixes: + - fix for RewriteLocation + - fix for HTTPS back-ends + - fix for RPC support + - fix for possible request smuggling by using multiple headers + +Many thanks to Frank Schmirler and Ruben Kerkhof for the contributed patches + +------------------------------------------------------------------------ +r69 \| roseg \| 2010-09-25 16:49:49 +0200 (Sat, 25 Sep 2010) \| 7 lines + +Release 2.6b + +Enhancements: + - pre-defined number of threads for better performance on small hardware + +Bug fixes: + +------------------------------------------------------------------------ +r68 \| roseg \| 2010-06-23 19:18:39 +0200 (Wed, 23 Jun 2010) \| 15 lines + +Release 2.6a + +Stable release 2.5.1 + +Enhancements: + - support for SNI via multiple Cert directives (thanks to Joe Gooch) + - translate hexadecimal characters in URL for pattern matching + - added support for a "Disabled" directive in the configuration + +Bug fixes: + - keep sessions for disabled back-ends, continue using them until the time-out + - fixed memory leak in session removal + - user IgnoreCase for CheckURL too + - fixed some issues with OpenSolaris build (thanks to Spradling Cloyce) + +------------------------------------------------------------------------ +r67 \| roseg \| 2010-02-02 12:49:00 +0100 (Tue, 02 Feb 2010) \| 9 lines + +Release 2.5 + +Enhancements: + +Bug fixes: + - fixed XML format to avoid problems with brain-dead parsers + - fixed Redirect to accept "/" as a path, so that "Redirect http://x/" is + considered an absolute path, but "Redirect http://x" is not + +------------------------------------------------------------------------ +r66 \| roseg \| 2010-01-04 17:20:55 +0100 (Mon, 04 Jan 2010) \| 7 lines + +Release 2.5e + +Enhancements: + - added support for symbolic host names in poundctl + +Bug fixes: + +------------------------------------------------------------------------ +r65 \| roseg \| 2009-12-07 17:01:21 +0100 (Mon, 07 Dec 2009) \| 9 lines + +Release 2.5d + +Enhancements: + - added support for --disable-pcreposix, --disable--tcmalloc, --disable-hoard in configuration script + +Bug fixes: + - fixed problem with long input lines in http.c + - if libpcreposix is present, then pcreposix.h must also be present + +------------------------------------------------------------------------ +r64 \| roseg \| 2009-09-21 13:16:57 +0200 (Mon, 21 Sep 2009) \| 8 lines + +Release 2.5c + +Enhancements: + - added support for HTTPS backends + +Bug fixes: + - fixed problem with sub-patterns in session parameters + +------------------------------------------------------------------------ +r63 \| roseg \| 2009-08-19 17:44:07 +0200 (Wed, 19 Aug 2009) \| 10 lines + +Release 2.5b + +Enhancements: + - support for ConnTO directive + - support for IgnoreCase directive + +Bug fixes: + - fixed problem in conf_fgets (\n confuses the regexp) + - changed RSA ephemeral keys regeneration default time (every 30 minutes) + +------------------------------------------------------------------------ +r62 \| roseg \| 2009-08-06 17:23:30 +0200 (Thu, 06 Aug 2009) \| 9 lines + +Release 2.5a + +Enhancements: + - support for include directive + +Bug fixes: + - fixed generation of ephemeral RSA keys (avoid premature locking) + - added pre-generated DH parameters + +------------------------------------------------------------------------ r61 \| roseg \| 2009-06-29 17:53:55 +0200 (Mon, 29 Jun 2009) \| 13 lines Release 2.4.5
[-] [+]	Changed	Pound-2.6.tgz/FAQ ^
@@ -24,11 +24,11 @@ No. Pound tries to be as transparent as possible - ideally a client should not be aware that there is anything between itself and the actual - Web server. A limited form of redirects are available - see the man page. + Web server. A limited form of redirect is available - see the man page. 1.5 Can I use Pound to deny certain requests? - Yes. Pound has quite a good mechanism for classifying requests and it + Yes. Pound has a rather good mechanism for classifying requests and it can deny/reject certain requests based on URL and/or header content. @@ -238,12 +238,9 @@ 4.9 Can Pound use HTTPS back-end servers? - No, that is not supported: such a connection would break a lot of things, - either security (Pound would effectively act as a man-in-the-middle, - breaking the end-to-end integrity of SSL) or functionality (if Pound - would just pass encrypted data back and forth things like session - tracking and validity checking would be impossible). This means that - such support is unlikely to ever be part of Pound. + Yes, but that is not always a very good idea. Such a setup would essentially + make Pound into a "man-in-the-middle" program. Even worse, the certificates + on the back-end would become meaningless - they are seen only by Pound. 5. Session tracking @@ -299,7 +296,7 @@ 6.5 Why does Pound not log anything when chrooted? On some systems you need access to /dev/log in order to use the syslog(8) - facility. Create the device as needed in the root jail you use. + facility. Create/link the device as needed in the root jail you use. 6.6 Why can't Pound log directly to a file?
[-] [+]	Changed	Pound-2.6.tgz/Makefile.in ^
@@ -1,5 +1,5 @@ # Pound - the reverse-proxy load-balancer -# Copyright (C) 2002-2007 Apsis GmbH +# Copyright (C) 2002-2010 Apsis GmbH # # This file is part of Pound. # @@ -8,7 +8,7 @@ # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# Foobar is distributed in the hope that it will be useful, +# Pound is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -21,7 +21,6 @@ # P.O.Box # 8707 Uetikon am See # Switzerland -# Tel: +41-44-920 4904 # EMail: roseg@apsis.ch CC=@PTHREAD_CC@ @@ -35,8 +34,8 @@ C_CERT1L="@C_CERT1L@" CFLAGS=-DF_CONF=\"$(F_CONF)\" -DVERSION=\"${VERSION}\" -DC_SSL=\"${C_SSL}\" -DC_T_RSA=\"${C_T_RSA}\" \ - -DC_MAXBUF=\"${C_MAXBUF}\" -DC_OWNER=\"${C_OWNER}\" -DC_GROUP=\"${C_GROUP}\" -DC_SUPER=\"${C_SUPER}\" \ - -DC_CERT1L=\"${C_CERT1L}\" @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@ + -DC_MAXBUF=\"${C_MAXBUF}\" -DC_OWNER=\"${C_OWNER}\" -DC_GROUP=\"${C_GROUP}\" \ + -DC_SUPER=\"${C_SUPER}\" -DC_CERT1L=\"${C_CERT1L}\" @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@ LIBS=@LIBS@ @PTHREAD_LIBS@ prefix=@prefix@ @@ -55,7 +54,16 @@ poundctl: poundctl.o ${CC} @LDFLAGS@ -o poundctl poundctl.o $(LIBS) -$(OBJS): pound.h +dh512.h: + openssl dhparam -5 -C -noout 512 > dh512.h + +dh1024.h: + openssl dhparam -5 -C -noout 1024 > dh1024.h + +$(OBJS) poundctl.o: pound.h config.h + +svc.o: svc.c dh512.h dh1024.h + ${CC} ${CFLAGS} -c -o svc.o svc.c install: all @INSTALL@ -d ${DESTDIR}@sbindir@ @@ -67,6 +75,7 @@ clean: rm -f pound $(OBJS) poundctl poundctl.o + rm -f dh512.h dh1024.h distclean: clean -rm -f config.h config.log config.status Makefile
[-] [+]	Changed	Pound-2.6.tgz/README ^
@@ -347,6 +347,19 @@ as usual. Pound supports these certificates and you can use virtual hosts in the normal way. + Update June 2010: starting with the 2.6 series, Pound has SNI support, if your + OpenSSL version supports it. Basically you supply Pound with several certificates, + one for each virtual host (wild card certificates - as described above - are + allowed). On connecting the client signals to which server it wants to talk, + and Pound searches among its certificates which would fit. Not all versions + of OpenSSL and not all clients support this mode, but if available it allows + for virtual hosts over HTTPS. + + An additional option is to use a semi-official TLS extension, the so called + alternate subject name. If your version of OpenSSL supports it you may specify + in one certificate several alternate server names. This requires support for a + special TLS feature, and nor all clients accept it. + VIRTUAL HOSTS IN ZOPE
[-] [+]	Changed	Pound-2.6.tgz/config.c ^
@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch / @@ -78,7 +77,7 @@ static regex_t Service, ServiceName, URL, HeadRequire, HeadDeny, BackEnd, Emergency, Priority, HAport, HAportAddr; static regex_t Redirect, RedirectN, TimeOut, Session, Type, TTL, ID, DynScale; static regex_t ClientCert, AddHeader, Ciphers, CAlist, VerifyList, CRLlist, NoHTTPS11; -static regex_t Grace; +static regex_t Grace, Include, ConnTO, IgnoreCase, HTTPS, HTTPSCert, Disabled, Threads, CNName; static regmatch_t matches[5]; @@ -94,14 +93,85 @@ static int def_facility = LOG_DAEMON; static int clnt_to = 10; static int be_to = 15; -static int n_lin = 0; +static int be_connto = 15; static int dynscale = 0; +static int ignore_case = 0; + +#define MAX_FIN 8 + +static FILE f_in[MAX_FIN]; +static char f_name[MAX_FIN]; +static int n_lin[MAX_FIN]; +static int cur_fin; + +static int +conf_init(const char name) +{ + if((f_name[0] = strdup(name)) == NULL) { + logmsg(LOG_ERR, "open %s: out of memory", name); + exit(1); + } + if((f_in[0] = fopen(name, "rt")) == NULL) { + logmsg(LOG_ERR, "can't open open %s", name); + exit(1); + } + n_lin[0] = 0; + cur_fin = 0; + return 0; +} + +void +conf_err(const char msg) +{ + logmsg(LOG_ERR, "%s line %d: %s", f_name[cur_fin], n_lin[cur_fin], msg); + exit(1); +} + +static char +conf_fgets(char buf, const int max) +{ + int i; + + for(;;) { + if(fgets(buf, max, f_in[cur_fin]) == NULL) { + fclose(f_in[cur_fin]); + free(f_name[cur_fin]); + if(cur_fin > 0) { + cur_fin--; + continue; + } else + return NULL; + } + n_lin[cur_fin]++; + for(i = 0; i < max; i++) + if(buf[i] == '\n' \|\| buf[i] == '\r') { + buf[i] = '\0'; + break; + } + if(!regexec(&Empty, buf, 4, matches, 0) \|\| !regexec(&Comment, buf, 4, matches, 0)) + / comment or empty line / + continue; + if(!regexec(&Include, buf, 4, matches, 0)) { + buf[matches[1].rm_eo] = '\0'; + if(cur_fin == (MAX_FIN - 1)) + conf_err("Include nesting too deep"); + cur_fin++; + if((f_name[cur_fin] = strdup(&buf[matches[1].rm_so])) == NULL) + conf_err("Include out of memory"); + if((f_in[cur_fin] = fopen(&buf[matches[1].rm_so], "rt")) == NULL) + conf_err("can't open included file"); + n_lin[cur_fin] = 0; + continue; + } + return buf; + } +} / * parse a back-end / static BACKEND -parse_be(FILE const f_conf, const int is_emergency) +parse_be(const int is_emergency) { char lin[MAXBUF]; BACKEND res; @@ -110,14 +180,13 @@ struct sockaddr_in in; struct sockaddr_in6 in6; - if((res = (BACKEND )malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: BackEnd config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (BACKEND )malloc(sizeof(BACKEND))) == NULL) + conf_err("BackEnd config: out of memory - aborted"); memset(res, 0, sizeof(BACKEND)); res->be_type = 0; res->addr.ai_socktype = SOCK_STREAM; res->to = is_emergency? 120: be_to; + res->conn_to = is_emergency? 120: be_connto; res->alive = 1; memset(&res->addr, 0, sizeof(res->addr)); res->priority = 5; @@ -126,28 +195,20 @@ res->next = NULL; has_addr = has_port = 0; pthread_mutex_init(&res->mut, NULL); - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) \|\| !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line / - continue; - } else if(!regexec(&Address, lin, 4, matches, 0)) { + if(!regexec(&Address, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(get_host(lin + matches[1].rm_so, &res->addr)) { / if we can't resolve it assume this is a UNIX domain socket / res->addr.ai_socktype = SOCK_STREAM; res->addr.ai_family = AF_UNIX; res->addr.ai_protocol = 0; - if((res->addr.ai_addr = (struct sockaddr )malloc(sizeof(struct sockaddr_un))) == NULL) { - logmsg(LOG_ERR, "line %d: out of memory", n_lin); - exit(1); - } - if((strlen(lin + matches[1].rm_so) + 1) > UNIX_PATH_MAX) { - logmsg(LOG_ERR, "line %d: UNIX path name too long (greater than %d)", n_lin, UNIX_PATH_MAX - 1); - exit(1); - } + if((res->addr.ai_addr = (struct sockaddr )malloc(sizeof(struct sockaddr_un))) == NULL) + conf_err("out of memory"); + if((strlen(lin + matches[1].rm_so) + 1) > UNIX_PATH_MAX) + conf_err("UNIX path name too long"); res->addr.ai_addrlen = strlen(lin + matches[1].rm_so) + 1; res->addr.ai_addr->sa_family = AF_UNIX; strcpy(res->addr.ai_addr->sa_data, lin + matches[1].rm_so); @@ -167,28 +228,23 @@ memcpy(res->addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: Port is supported only for INET/INET6 back-ends", n_lin); - exit(1); + conf_err("Port is supported only for INET/INET6 back-ends"); } has_port = 1; } else if(!regexec(&Priority, lin, 4, matches, 0)) { - if(is_emergency) { - logmsg(LOG_ERR, "line %d: Priority is not supported for Emergency back-ends", n_lin); - exit(1); - } + if(is_emergency) + conf_err("Priority is not supported for Emergency back-ends"); res->priority = atoi(lin + matches[1].rm_so); } else if(!regexec(&TimeOut, lin, 4, matches, 0)) { res->to = atoi(lin + matches[1].rm_so); + } else if(!regexec(&ConnTO, lin, 4, matches, 0)) { + res->conn_to = atoi(lin + matches[1].rm_so); } else if(!regexec(&HAport, lin, 4, matches, 0)) { - if(is_emergency) { - logmsg(LOG_ERR, "line %d: HAport is not supported for Emergency back-ends", n_lin); - exit(1); - } + if(is_emergency) + conf_err("HAport is not supported for Emergency back-ends"); res->ha_addr = res->addr; - if((res->ha_addr.ai_addr = (struct sockaddr )malloc(res->addr.ai_addrlen)) == NULL) { - logmsg(LOG_ERR, "line %d: out of memory", n_lin); - exit(1); - } + if((res->ha_addr.ai_addr = (struct sockaddr )malloc(res->addr.ai_addrlen)) == NULL) + conf_err("out of memory"); memcpy(res->ha_addr.ai_addr, res->addr.ai_addr, res->addr.ai_addrlen); switch(res->addr.ai_family) { case AF_INET: @@ -202,24 +258,19 @@ memcpy(res->addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: HAport is supported only for INET/INET6 back-ends", n_lin); - exit(1); + conf_err("HAport is supported only for INET/INET6 back-ends"); } } else if(!regexec(&HAportAddr, lin, 4, matches, 0)) { - if(is_emergency) { - logmsg(LOG_ERR, "line %d: HAportAddr is not supported for Emergency back-ends", n_lin); - exit(1); - } + if(is_emergency) + conf_err("HAportAddr is not supported for Emergency back-ends"); lin[matches[1].rm_eo] = '\0'; if(get_host(lin + matches[1].rm_so, &res->ha_addr)) { / if we can't resolve it assume this is a UNIX domain socket / res->addr.ai_socktype = SOCK_STREAM; res->ha_addr.ai_family = AF_UNIX; res->ha_addr.ai_protocol = 0; - if((res->ha_addr.ai_addr = (struct sockaddr )strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: out of memory", n_lin); - exit(1); - } + if((res->ha_addr.ai_addr = (struct sockaddr )strdup(lin + matches[1].rm_so)) == NULL) + conf_err("out of memory"); res->addr.ai_addrlen = strlen(lin + matches[1].rm_so) + 1; } else switch(res->ha_addr.ai_family) { case AF_INET: @@ -233,27 +284,49 @@ memcpy(res->ha_addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: Unknown HA address type", n_lin); - exit(1); + conf_err("Unknown HA address type"); } + } else if(!regexec(&HTTPS, lin, 4, matches, 0)) { + if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL); + SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_options(res->ctx, SSL_OP_ALL); + sprintf(lin, "%d-Pound-%ld", getpid(), random()); + SSL_CTX_set_session_id_context(res->ctx, (unsigned char )lin, strlen(lin)); + SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback); + SSL_CTX_set_tmp_dh_callback(res->ctx, DH_tmp_callback); + } else if(!regexec(&HTTPSCert, lin, 4, matches, 0)) { + if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + lin[matches[1].rm_eo] = '\0'; + if(SSL_CTX_use_certificate_chain_file(res->ctx, lin + matches[1].rm_so) != 1) + conf_err("SSL_CTX_use_certificate_chain_file failed - aborted"); + if(SSL_CTX_use_PrivateKey_file(res->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) + conf_err("SSL_CTX_use_PrivateKey_file failed - aborted"); + if(SSL_CTX_check_private_key(res->ctx) != 1) + conf_err("SSL_CTX_check_private_key failed - aborted"); + SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL); + SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_options(res->ctx, SSL_OP_ALL); + sprintf(lin, "%d-Pound-%ld", getpid(), random()); + SSL_CTX_set_session_id_context(res->ctx, (unsigned char )lin, strlen(lin)); + SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback); + SSL_CTX_set_tmp_dh_callback(res->ctx, DH_tmp_callback); + } else if(!regexec(&Disabled, lin, 4, matches, 0)) { + res->disabled = atoi(lin + matches[1].rm_so); } else if(!regexec(&End, lin, 4, matches, 0)) { - if(!has_addr) { - logmsg(LOG_ERR, "line %d: BackEnd missing Address - aborted", n_lin); - exit(1); - } - if((res->addr.ai_family == AF_INET \|\| res->addr.ai_family == AF_INET6) && !has_port) { - logmsg(LOG_ERR, "line %d: BackEnd missing Port - aborted", n_lin); - exit(1); - } + if(!has_addr) + conf_err("BackEnd missing Address - aborted"); + if((res->addr.ai_family == AF_INET \|\| res->addr.ai_family == AF_INET6) && !has_port) + conf_err("BackEnd missing Port - aborted"); return res; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: BackEnd premature EOF", n_lin); - exit(1); + conf_err("BackEnd premature EOF"); return NULL; } @@ -261,22 +334,17 @@ parse a session / static void -parse_sess(FILE const f_conf, SERVICE const svc) +parse_sess(SERVICE const svc) { - char lin[MAXBUF], cp; + char lin[MAXBUF], cp, parm; - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + parm = NULL; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) \|\| !regexec(&Comment, lin, 4, matches, 0)) { - / comment or empty line / - continue; - } else if(!regexec(&Type, lin, 4, matches, 0)) { - if(svc->sess_type != SESS_NONE) { - logmsg(LOG_ERR, "line %d: Multiple Session types in one Service - aborted", n_lin); - exit(1); - } + if(!regexec(&Type, lin, 4, matches, 0)) { + if(svc->sess_type != SESS_NONE) + conf_err("Multiple Session types in one Service - aborted"); lin[matches[1].rm_eo] = '\0'; cp = lin + matches[1].rm_so; if(!strcasecmp(cp, "IP")) @@ -291,76 +359,62 @@ svc->sess_type = SESS_BASIC; else if(!strcasecmp(cp, "HEADER")) svc->sess_type = SESS_HEADER; - else { - logmsg(LOG_ERR, "line %d: Unknown Session type \"%s\" - aborted", n_lin, cp); - exit(1); - } + else + conf_err("Unknown Session type"); } else if(!regexec(&TTL, lin, 4, matches, 0)) { svc->sess_ttl = atoi(lin + matches[1].rm_so); } else if(!regexec(&ID, lin, 4, matches, 0)) { - if(svc->sess_type != SESS_COOKIE && svc->sess_type != SESS_URL && svc->sess_type != SESS_HEADER) { - logmsg(LOG_ERR, "line %d: no ID permitted unless COOKIE/URL/HEADER Session - aborted", n_lin); - exit(1); - } + if(svc->sess_type != SESS_COOKIE && svc->sess_type != SESS_URL && svc->sess_type != SESS_HEADER) + conf_err("no ID permitted unless COOKIE/URL/HEADER Session - aborted"); lin[matches[1].rm_eo] = '\0'; - if((svc->sess_parm = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: ID config: out of memory - aborted", n_lin); - exit(1); - } + if((parm = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("ID config: out of memory - aborted"); } else if(!regexec(&End, lin, 4, matches, 0)) { - if(svc->sess_type == SESS_NONE) { - logmsg(LOG_ERR, "line %d: Session type not defined - aborted", n_lin); - exit(1); - } - if(svc->sess_ttl == 0) { - logmsg(LOG_ERR, "line %d: Session TTL not defined - aborted", n_lin); - exit(1); - } + if(svc->sess_type == SESS_NONE) + conf_err("Session type not defined - aborted"); + if(svc->sess_ttl == 0) + conf_err("Session TTL not defined - aborted"); if((svc->sess_type == SESS_COOKIE \|\| svc->sess_type == SESS_URL \|\| svc->sess_type == SESS_HEADER) - && svc->sess_parm == NULL) { - logmsg(LOG_ERR, "line %d: Session ID not defined - aborted", n_lin); - exit(1); - } + && parm == NULL) + conf_err("Session ID not defined - aborted"); if(svc->sess_type == SESS_COOKIE) { - snprintf(lin, MAXBUF - 1, "Cookie[^:]:.[ \t]%s=([^;])", svc->sess_parm); - if(regcomp(&svc->sess_pat, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: COOKIE pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + snprintf(lin, MAXBUF - 1, "Cookie[^:]:.[ \t]%s=", parm); + if(regcomp(&svc->sess_start, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("COOKIE pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^;])", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("COOKIE pattern failed - aborted"); } else if(svc->sess_type == SESS_URL) { - snprintf(lin, MAXBUF - 1, "[?&]%s=([^&;#])", svc->sess_parm); - if(regcomp(&svc->sess_pat, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: URL pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + snprintf(lin, MAXBUF - 1, "[?&]%s=", parm); + if(regcomp(&svc->sess_start, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("URL pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^&;#])", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("URL pattern failed - aborted"); } else if(svc->sess_type == SESS_PARM) { - snprintf(lin, MAXBUF - 1, ";([^?])"); - if(regcomp(&svc->sess_pat, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: PARM pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + if(regcomp(&svc->sess_start, ";", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("PARM pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^?])", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("PARM pattern failed - aborted"); } else if(svc->sess_type == SESS_BASIC) { - snprintf(lin, MAXBUF - 1, "Authorization:[ \t]Basic[ \t]([^ \t])[ \t]"); - if(regcomp(&svc->sess_pat, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: BASIC pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + if(regcomp(&svc->sess_start, "Authorization:[ \t]Basic[ \t]", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("BASIC pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^ \t])", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("BASIC pattern failed - aborted"); } else if(svc->sess_type == SESS_HEADER) { - snprintf(lin, MAXBUF - 1, "%s:[ \t]([^ \t])[ \t]", svc->sess_parm); - if(regcomp(&svc->sess_pat, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HEADER pattern \"%s\" failed - aborted", n_lin, lin); - exit(1); - } + snprintf(lin, MAXBUF - 1, "%s:[ \t]", parm); + if(regcomp(&svc->sess_start, lin, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("HEADER pattern failed - aborted"); + if(regcomp(&svc->sess_pat, "([^ \t])", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("HEADER pattern failed - aborted"); } + if(parm != NULL) + free(parm); return; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: Session premature EOF", n_lin); - exit(1); + conf_err("Session premature EOF"); return; } @@ -376,212 +430,187 @@ k = e->key; res = 2166136261; while(k) - res = (res ^ k++) 16777619; + res = ((res ^ k++) 16777619) & 0xFFFFFFFF; return res; } -static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE ) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +static IMPLEMENT_LHASH_HASH_FN(t, TABNODE) +#else +static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE ) +#endif + static int t_cmp(const TABNODE d1, const TABNODE d2) { return strcmp(d1->key, d2->key); } + +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +static IMPLEMENT_LHASH_COMP_FN(t, TABNODE) +#else static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE ) +#endif + / * parse a service / static SERVICE -parse_service(FILE const f_conf, const char svc_name) +parse_service(const char svc_name) { char lin[MAXBUF]; SERVICE res; BACKEND be; MATCHER m; + int ign_case; - if((res = (SERVICE )malloc(sizeof(SERVICE))) == NULL) { - logmsg(LOG_ERR, "line %d: Service config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (SERVICE )malloc(sizeof(SERVICE))) == NULL) + conf_err("Service config: out of memory - aborted"); memset(res, 0, sizeof(SERVICE)); res->sess_type = SESS_NONE; res->dynscale = dynscale; pthread_mutex_init(&res->mut, NULL); if(svc_name) strncpy(res->name, svc_name, KEY_SIZE); - if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) { - logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin); - exit(1); - } - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) +#else + if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) +#endif + conf_err("lh_new failed - aborted"); + ign_case = ignore_case; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) \|\| !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line / - continue; - } else if(!regexec(&URL, lin, 4, matches, 0)) { + if(!regexec(&URL, lin, 4, matches, 0)) { if(res->url) { for(m = res->url; m->next; m = m->next) ; - if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: URL config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("URL config: out of memory - aborted"); m = m->next; } else { - if((res->url = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: URL config: out of memory - aborted", n_lin); - exit(1); - } + if((res->url = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("URL config: out of memory - aborted"); m = res->url; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: URL bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_NEWLINE \| REG_EXTENDED \| (ign_case? REG_ICASE: 0))) + conf_err("URL bad pattern - aborted"); } else if(!regexec(&HeadRequire, lin, 4, matches, 0)) { if(res->req_head) { for(m = res->req_head; m->next; m = m->next) ; - if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRequire config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRequire config: out of memory - aborted"); m = m->next; } else { - if((res->req_head = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRequire config: out of memory - aborted", n_lin); - exit(1); - } + if((res->req_head = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRequire config: out of memory - aborted"); m = res->req_head; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadRequire bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("HeadRequire bad pattern - aborted"); } else if(!regexec(&HeadDeny, lin, 4, matches, 0)) { if(res->deny_head) { for(m = res->deny_head; m->next; m = m->next) ; - if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadDeny config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadDeny config: out of memory - aborted"); m = m->next; } else { - if((res->deny_head = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadDeny config: out of memory - aborted", n_lin); - exit(1); - } + if((res->deny_head = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadDeny config: out of memory - aborted"); m = res->deny_head; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadDeny bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("HeadDeny bad pattern - aborted"); } else if(!regexec(&Redirect, lin, 4, matches, 0)) { if(res->backends) { for(be = res->backends; be->next; be = be->next) ; - if((be->next = (BACKEND )malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((be->next = (BACKEND )malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = be->next; } else { - if((res->backends = (BACKEND )malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((res->backends = (BACKEND )malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = res->backends; } memset(be, 0, sizeof(BACKEND)); be->be_type = 302; be->priority = 1; be->alive = 1; - pthread_mutex_init(&res->mut, NULL); + pthread_mutex_init(& be->mut, NULL); lin[matches[1].rm_eo] = '\0'; - if((be->url = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: Redirector config: out of memory - aborted", n_lin); - exit(1); - } + if((be->url = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("Redirector config: out of memory - aborted"); / split the URL into its fields / - if(regexec(&LOCATION, be->url, 4, matches, 0)) { - logmsg(LOG_ERR, "line %d: Redirect bad URL \"%s\" - aborted", n_lin, be->url); - exit(1); - } - if(be->url[matches[3].rm_so] == '/') - matches[3].rm_so++; - / if the path component is empty or a sigle slash / - be->redir_req = ((matches[3].rm_eo - matches[3].rm_so) < 1); + if(regexec(&LOCATION, be->url, 4, matches, 0)) + conf_err("Redirect bad URL - aborted"); + if((be->redir_req = matches[3].rm_eo - matches[3].rm_so) == 1) + / the path is a single '/', so remove it / + be->url[matches[3].rm_so] = '\0'; } else if(!regexec(&RedirectN, lin, 4, matches, 0)) { if(res->backends) { for(be = res->backends; be->next; be = be->next) ; - if((be->next = (BACKEND )malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((be->next = (BACKEND )malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = be->next; } else { - if((res->backends = (BACKEND )malloc(sizeof(BACKEND))) == NULL) { - logmsg(LOG_ERR, "line %d: Redirect config: out of memory - aborted", n_lin); - exit(1); - } + if((res->backends = (BACKEND )malloc(sizeof(BACKEND))) == NULL) + conf_err("Redirect config: out of memory - aborted"); be = res->backends; } memset(be, 0, sizeof(BACKEND)); be->be_type = atoi(lin + matches[1].rm_so); be->priority = 1; be->alive = 1; - pthread_mutex_init(&res->mut, NULL); + pthread_mutex_init(& be->mut, NULL); lin[matches[2].rm_eo] = '\0'; - if((be->url = strdup(lin + matches[2].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: Redirector config: out of memory - aborted", n_lin); - exit(1); - } + if((be->url = strdup(lin + matches[2].rm_so)) == NULL) + conf_err("Redirector config: out of memory - aborted"); / split the URL into its fields / - if(regexec(&LOCATION, be->url, 4, matches, 0)) { - logmsg(LOG_ERR, "line %d: Redirect bad URL \"%s\" - aborted", n_lin, be->url); - exit(1); - } - if(be->url[matches[3].rm_so] == '/') - matches[3].rm_so++; - / if the path component is empty or a sigle slash / - be->redir_req = ((matches[3].rm_eo - matches[3].rm_so) < 1); + if(regexec(&LOCATION, be->url, 4, matches, 0)) + conf_err("Redirect bad URL - aborted"); + if((be->redir_req = matches[3].rm_eo - matches[3].rm_so) == 1) + / the path is a single '/', so remove it / + be->url[matches[3].rm_so] = '\0'; } else if(!regexec(&BackEnd, lin, 4, matches, 0)) { if(res->backends) { for(be = res->backends; be->next; be = be->next) ; - be->next = parse_be(f_conf, 0); + be->next = parse_be(0); } else - res->backends = parse_be(f_conf, 0); + res->backends = parse_be(0); } else if(!regexec(&Emergency, lin, 4, matches, 0)) { - res->emergency = parse_be(f_conf, 1); + res->emergency = parse_be(1); } else if(!regexec(&Session, lin, 4, matches, 0)) { - parse_sess(f_conf, res); + parse_sess(res); + } else if(!regexec(&DynScale, lin, 4, matches, 0)) { + res->dynscale = atoi(lin + matches[1].rm_so); + } else if(!regexec(&IgnoreCase, lin, 4, matches, 0)) { + ign_case = atoi(lin + matches[1].rm_so); + } else if(!regexec(&Disabled, lin, 4, matches, 0)) { + res->disabled = atoi(lin + matches[1].rm_so); } else if(!regexec(&End, lin, 4, matches, 0)) { for(be = res->backends; be; be = be->next) res->tot_pri += be->priority; res->abs_pri = res->tot_pri; return res; - } else if(!regexec(&DynScale, lin, 4, matches, 0)) { - res->dynscale = atoi(lin + matches[1].rm_so); } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: Service premature EOF", n_lin); - exit(1); + conf_err("Service premature EOF"); return NULL; } @@ -595,22 +624,14 @@ struct stat st; int fin; - if(stat(fname, &st)) { - logmsg(LOG_ERR, "line %d: can't stat Err file \"%s\" (%s) - aborted", n_lin, fname, strerror(errno)); - exit(1); - } - if((fin = open(fname, O_RDONLY)) < 0) { - logmsg(LOG_ERR, "line %d: can't open Err file \"%s\" (%s) - aborted", n_lin, fname, strerror(errno)); - exit(1); - } - if((res = malloc(st.st_size + 1)) == NULL) { - logmsg(LOG_ERR, "line %d: can't alloc Err file \"%s\" (out of memory) - aborted", n_lin, fname); - exit(1); - } - if(read(fin, res, st.st_size) != st.st_size) { - logmsg(LOG_ERR, "line %d: can't read Err file \"%s\" (%s) - aborted", n_lin, fname, strerror(errno)); - exit(1); - } + if(stat(fname, &st)) + conf_err("can't stat Err file - aborted"); + if((fin = open(fname, O_RDONLY)) < 0) + conf_err("can't open Err file - aborted"); + if((res = malloc(st.st_size + 1)) == NULL) + conf_err("can't alloc Err file (out of memory) - aborted"); + if(read(fin, res, st.st_size) != st.st_size) + conf_err("can't read Err file - aborted"); res[st.st_size] = '\0'; close(fin); return res; @@ -620,7 +641,7 @@ parse an HTTP listener / static LISTENER -parse_HTTP(FILE const f_conf) +parse_HTTP(void) { char lin[MAXBUF]; LISTENER res; @@ -630,10 +651,8 @@ struct sockaddr_in in; struct sockaddr_in6 in6; - if((res = (LISTENER )malloc(sizeof(LISTENER))) == NULL) { - logmsg(LOG_ERR, "line %d: ListenHTTP config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (LISTENER )malloc(sizeof(LISTENER))) == NULL) + conf_err("ListenHTTP config: out of memory - aborted"); memset(res, 0, sizeof(LISTENER)); res->to = clnt_to; res->rewr_loc = 1; @@ -642,28 +661,18 @@ res->err501 = "This method may not be used."; res->err503 = "The service is not available. Please try again later."; res->log_level = log_level; - if(regcomp(&res->verb, xhttp[0], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad default pattern - aborted", n_lin); - exit(1); - } + if(regcomp(&res->verb, xhttp[0], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("xHTTP bad default pattern - aborted"); has_addr = has_port = 0; - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) \|\| !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line / - continue; - } else if(!regexec(&Address, lin, 4, matches, 0)) { + if(!regexec(&Address, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if(get_host(lin + matches[1].rm_so, &res->addr)) { - logmsg(LOG_ERR, "line %d: Unknown Listener address \"%s\"", n_lin, lin + matches[1].rm_so); - exit(1); - } - if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) { - logmsg(LOG_ERR, "line %d: Unknown Listener address family %d", n_lin, res->addr.ai_family); - exit(1); - } + if(get_host(lin + matches[1].rm_so, &res->addr)) + conf_err("Unknown Listener address"); + if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) + conf_err("Unknown Listener address family"); has_addr = 1; } else if(!regexec(&Port, lin, 4, matches, 0)) { switch(res->addr.ai_family) { @@ -678,8 +687,7 @@ memcpy(res->addr.ai_addr, &in6, sizeof(in6)); break; default: - logmsg(LOG_ERR, "line %d: Unknown Listener address family %d", n_lin, res->addr.ai_family); - exit(1); + conf_err("Unknown Listener address family"); } has_port = 1; } else if(!regexec(&xHTTP, lin, 4, matches, 0)) { @@ -687,22 +695,16 @@ n = atoi(lin + matches[1].rm_so); regfree(&res->verb); - if(regcomp(&res->verb, xhttp[n], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad pattern %d - aborted", n_lin, n); - exit(1); - } + if(regcomp(&res->verb, xhttp[n], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("xHTTP bad pattern - aborted"); } else if(!regexec(&Client, lin, 4, matches, 0)) { res->to = atoi(lin + matches[1].rm_so); } else if(!regexec(&CheckURL, lin, 4, matches, 0)) { - if(res->has_pat) { - logmsg(LOG_ERR, "line %d: CheckURL multiple pattern - aborted", n_lin); - exit(1); - } + if(res->has_pat) + conf_err("CheckURL multiple pattern - aborted"); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: CheckURL bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE \| REG_EXTENDED \| (ignore_case? REG_ICASE: 0))) + conf_err("CheckURL bad pattern - aborted"); res->has_pat = 1; } else if(!regexec(&Err414, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; @@ -717,34 +719,34 @@ lin[matches[1].rm_eo] = '\0'; res->err503 = file2str(lin + matches[1].rm_so); } else if(!regexec(&MaxRequest, lin, 4, matches, 0)) { - res->max_req = atol(lin + matches[1].rm_so); + res->max_req = ATOL(lin + matches[1].rm_so); } else if(!regexec(&HeadRemove, lin, 4, matches, 0)) { if(res->head_off) { for(m = res->head_off; m->next; m = m->next) ; - if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = m->next; } else { - if((res->head_off = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((res->head_off = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = res->head_off; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadRemove bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("HeadRemove bad pattern - aborted"); } else if(!regexec(&AddHeader, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: AddHeader config: out of memory - aborted", n_lin); - exit(1); + if(res->add_head == NULL) { + if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("AddHeader config: out of memory - aborted"); + } else { + if((res->add_head = realloc(res->add_head, strlen(res->add_head) + strlen(lin + matches[1].rm_so) + 3)) + == NULL) + conf_err("AddHeader config: out of memory - aborted"); + strcat(res->add_head, "\r\n"); + strcat(res->add_head, lin + matches[1].rm_so); } } else if(!regexec(&RewriteLocation, lin, 4, matches, 0)) { res->rewr_loc = atoi(lin + matches[1].rm_so); @@ -754,35 +756,31 @@ res->log_level = atoi(lin + matches[1].rm_so); } else if(!regexec(&Service, lin, 4, matches, 0)) { if(res->services == NULL) - res->services = parse_service(f_conf, NULL); + res->services = parse_service(NULL); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, NULL); + svc->next = parse_service(NULL); } } else if(!regexec(&ServiceName, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(res->services == NULL) - res->services = parse_service(f_conf, lin + matches[1].rm_so); + res->services = parse_service(lin + matches[1].rm_so); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, lin + matches[1].rm_so); + svc->next = parse_service(lin + matches[1].rm_so); } } else if(!regexec(&End, lin, 4, matches, 0)) { - if(!has_addr \|\| !has_port) { - logmsg(LOG_ERR, "line %d: ListenHTTP missing Address or Port - aborted", n_lin); - exit(1); - } + if(!has_addr \|\| !has_port) + conf_err("ListenHTTP missing Address or Port - aborted"); return res; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive - aborted"); } } - logmsg(LOG_ERR, "line %d: ListenHTTP premature EOF", n_lin); - exit(1); + conf_err("ListenHTTP premature EOF"); return NULL; } / @@ -794,30 +792,51 @@ return 1; } +#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB +static int +SNI_server_name(SSL ssl, int dummy, POUND_CTX ctx) +{ + const char server_name; + POUND_CTX pc; + + if((server_name = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name)) == NULL) + return SSL_TLSEXT_ERR_NOACK; + + / logmsg(LOG_DEBUG, "Received SSL SNI Header for servername %s", servername); / + + SSL_set_SSL_CTX(ssl, NULL); + for(pc = ctx; pc; pc = pc->next) + if(fnmatch(pc->server_name, server_name, 0) == 0) { + / logmsg(LOG_DEBUG, "Found cert for %s", servername); / + SSL_set_SSL_CTX(ssl, pc->ctx); + return SSL_TLSEXT_ERR_OK; + } + + / logmsg(LOG_DEBUG, "No match for %s, default used", server_name); / + SSL_set_SSL_CTX(ssl, ctx->ctx); + return SSL_TLSEXT_ERR_OK; +} +#endif + / * parse an HTTPS listener / static LISTENER -parse_HTTPS(FILE const f_conf) +parse_HTTPS(void) { char lin[MAXBUF]; LISTENER res; SERVICE svc; MATCHER m; - int has_addr, has_port, has_cert; + int has_addr, has_port, has_other; struct hostent host; struct sockaddr_in in; struct sockaddr_in6 in6; + POUND_CTX pc; - if((res = (LISTENER )malloc(sizeof(LISTENER))) == NULL) { - logmsg(LOG_ERR, "line %d: ListenHTTPS config: out of memory - aborted", n_lin); - exit(1); - } + if((res = (LISTENER )malloc(sizeof(LISTENER))) == NULL) + conf_err("ListenHTTPS config: out of memory - aborted"); memset(res, 0, sizeof(LISTENER)); - if((res->ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) { - logmsg(LOG_ERR, "line %d: SSL_CTX_new failed - aborted", n_lin); - exit(1); - } res->to = clnt_to; res->rewr_loc = 1; @@ -826,28 +845,18 @@ res->err501 = "This method may not be used."; res->err503 = "The service is not available. Please try again later."; res->log_level = log_level; - if(regcomp(&res->verb, xhttp[0], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad default pattern - aborted", n_lin); - exit(1); - } - has_addr = has_port = has_cert = 0; - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + if(regcomp(&res->verb, xhttp[0], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("xHTTP bad default pattern - aborted"); + has_addr = has_port = has_other = 0; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) \|\| !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line / - continue; - } else if(!regexec(&Address, lin, 4, matches, 0)) { + if(!regexec(&Address, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if(get_host(lin + matches[1].rm_so, &res->addr)) { - logmsg(LOG_ERR, "line %d: Unknown Listener address \"%s\"", n_lin, lin + matches[1].rm_so); - exit(1); - } - if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) { - logmsg(LOG_ERR, "line %d: Unknown Listener address family %d", n_lin, res->addr.ai_family); - exit(1); - } + if(get_host(lin + matches[1].rm_so, &res->addr)) + conf_err("Unknown Listener address"); + if(res->addr.ai_family != AF_INET && res->addr.ai_family != AF_INET6) + conf_err("Unknown Listener address family"); has_addr = 1; } else if(!regexec(&Port, lin, 4, matches, 0)) { if(res->addr.ai_family == AF_INET) { @@ -865,22 +874,16 @@ n = atoi(lin + matches[1].rm_so); regfree(&res->verb); - if(regcomp(&res->verb, xhttp[n], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: xHTTP bad pattern %d - aborted", n_lin, n); - exit(1); - } + if(regcomp(&res->verb, xhttp[n], REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("xHTTP bad pattern - aborted"); } else if(!regexec(&Client, lin, 4, matches, 0)) { res->to = atoi(lin + matches[1].rm_so); } else if(!regexec(&CheckURL, lin, 4, matches, 0)) { - if(res->has_pat) { - logmsg(LOG_ERR, "line %d: CheckURL multiple pattern - aborted", n_lin); - exit(1); - } + if(res->has_pat) + conf_err("CheckURL multiple pattern - aborted"); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: CheckURL bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&res->url_pat, lin + matches[1].rm_so, REG_NEWLINE \| REG_EXTENDED \| (ignore_case? REG_ICASE: 0))) + conf_err("CheckURL bad pattern - aborted"); res->has_pat = 1; } else if(!regexec(&Err414, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; @@ -895,29 +898,23 @@ lin[matches[1].rm_eo] = '\0'; res->err503 = file2str(lin + matches[1].rm_so); } else if(!regexec(&MaxRequest, lin, 4, matches, 0)) { - res->max_req = atol(lin + matches[1].rm_so); + res->max_req = ATOL(lin + matches[1].rm_so); } else if(!regexec(&HeadRemove, lin, 4, matches, 0)) { if(res->head_off) { for(m = res->head_off; m->next; m = m->next) ; - if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((m->next = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = m->next; } else { - if((res->head_off = (MATCHER )malloc(sizeof(MATCHER))) == NULL) { - logmsg(LOG_ERR, "line %d: HeadRemove config: out of memory - aborted", n_lin); - exit(1); - } + if((res->head_off = (MATCHER )malloc(sizeof(MATCHER))) == NULL) + conf_err("HeadRemove config: out of memory - aborted"); m = res->head_off; } memset(m, 0, sizeof(MATCHER)); lin[matches[1].rm_eo] = '\0'; - if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) { - logmsg(LOG_ERR, "line %d: HeadRemove bad pattern \"%s\" - aborted", n_lin, lin + matches[1].rm_so); - exit(1); - } + if(regcomp(&m->pat, lin + matches[1].rm_so, REG_ICASE \| REG_NEWLINE \| REG_EXTENDED)) + conf_err("HeadRemove bad pattern - aborted"); } else if(!regexec(&RewriteLocation, lin, 4, matches, 0)) { res->rewr_loc = atoi(lin + matches[1].rm_so); } else if(!regexec(&RewriteDestination, lin, 4, matches, 0)) { @@ -925,138 +922,203 @@ } else if(!regexec(&LogLevel, lin, 4, matches, 0)) { res->log_level = atoi(lin + matches[1].rm_so); } else if(!regexec(&Cert, lin, 4, matches, 0)) { - lin[matches[1].rm_eo] = '\0'; - if(SSL_CTX_use_certificate_chain_file(res->ctx, lin + matches[1].rm_so) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_use_certificate_chain_file \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - if(SSL_CTX_use_PrivateKey_file(res->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_use_PrivateKey_file \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - if(SSL_CTX_check_private_key(res->ctx) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_check_private_key \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - has_cert = 1; +#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB + / we have support for SNI / + FILE fcert; + char server_name[MAXBUF], cp; + X509 x509; + + if(has_other) + conf_err("Cert directives MUST precede other SSL-specific directives - aborted"); + if(res->ctx) { + for(pc = res->ctx; pc->next; pc = pc->next) + ; + if((pc->next = malloc(sizeof(POUND_CTX))) == NULL) + conf_err("ListenHTTPS new POUND_CTX: out of memory - aborted"); + pc = pc->next; + } else { + if((res->ctx = malloc(sizeof(POUND_CTX))) == NULL) + conf_err("ListenHTTPS new POUND_CTX: out of memory - aborted"); + pc = res->ctx; + } + if((pc->ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + pc->server_name = NULL; + pc->next = NULL; + lin[matches[1].rm_eo] = '\0'; + if(SSL_CTX_use_certificate_chain_file(pc->ctx, lin + matches[1].rm_so) != 1) + conf_err("SSL_CTX_use_certificate_chain_file failed - aborted"); + if(SSL_CTX_use_PrivateKey_file(pc->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) + conf_err("SSL_CTX_use_PrivateKey_file failed - aborted"); + if(SSL_CTX_check_private_key(pc->ctx) != 1) + conf_err("SSL_CTX_check_private_key failed - aborted"); + if((fcert = fopen(lin + matches[1].rm_so, "r")) == NULL) + conf_err("ListenHTTPS: could not open certificate file"); + if((x509 = PEM_read_X509(fcert, NULL, NULL, NULL)) == NULL) + conf_err("ListenHTTPS: could not get certificate subject"); + fclose(fcert); + memset(server_name, '\0', MAXBUF); + X509_NAME_oneline(X509_get_subject_name(x509), server_name, MAXBUF - 1); + X509_free(x509); + if(!regexec(&CNName, server_name, 4, matches, 0)) { + server_name[matches[1].rm_eo] = '\0'; + if((pc->server_name = strdup(server_name + matches[1].rm_so)) == NULL) + conf_err("ListenHTTPS: could not set certificate subject"); + } else + conf_err("ListenHTTPS: could not get certificate CN"); +#else + /* no SNI support / + if(has_other) + conf_err("Cert directives MUST precede other SSL-specific directives - aborted"); + if(res->ctx) + conf_err("ListenHTTPS: multiple certificates not supported - aborted"); + if((res->ctx = malloc(sizeof(POUND_CTX))) == NULL) + conf_err("ListenHTTPS new POUND_CTX: out of memory - aborted"); + res->ctx->server_name = NULL; + res->ctx->next = NULL; + if((res->ctx->ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) + conf_err("SSL_CTX_new failed - aborted"); + lin[matches[1].rm_eo] = '\0'; + if(SSL_CTX_use_certificate_chain_file(res->ctx->ctx, lin + matches[1].rm_so) != 1) + conf_err("SSL_CTX_use_certificate_chain_file failed - aborted"); + if(SSL_CTX_use_PrivateKey_file(res->ctx->ctx, lin + matches[1].rm_so, SSL_FILETYPE_PEM) != 1) + conf_err("SSL_CTX_use_PrivateKey_file failed - aborted"); + if(SSL_CTX_check_private_key(res->ctx->ctx) != 1) + conf_err("SSL_CTX_check_private_key failed - aborted"); +#endif } else if(!regexec(&ClientCert, lin, 4, matches, 0)) { + has_other = 1; + if(res->ctx == NULL) + conf_err("ClientCert may only be used after Cert - aborted"); switch(res->clnt_check = atoi(lin + matches[1].rm_so)) { case 0: / don't ask / - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL); + for(pc = res->ctx; pc; pc = pc->next) + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_NONE, NULL); break; case 1: / ask but OK if no client certificate / - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_PEER \| SSL_VERIFY_CLIENT_ONCE, NULL); - SSL_CTX_set_verify_depth(res->ctx, atoi(lin + matches[2].rm_so)); + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_PEER \| SSL_VERIFY_CLIENT_ONCE, NULL); + SSL_CTX_set_verify_depth(pc->ctx, atoi(lin + matches[2].rm_so)); + } break; case 2: / ask and fail if no client certificate / - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_PEER \| SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); - SSL_CTX_set_verify_depth(res->ctx, atoi(lin + matches[2].rm_so)); + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_PEER \| SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); + SSL_CTX_set_verify_depth(pc->ctx, atoi(lin + matches[2].rm_so)); + } break; case 3: / ask but do not verify client certificate / - SSL_CTX_set_verify(res->ctx, SSL_VERIFY_PEER \| SSL_VERIFY_CLIENT_ONCE, verify_OK); - SSL_CTX_set_verify_depth(res->ctx, atoi(lin + matches[2].rm_so)); + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_verify(pc->ctx, SSL_VERIFY_PEER \| SSL_VERIFY_CLIENT_ONCE, verify_OK); + SSL_CTX_set_verify_depth(pc->ctx, atoi(lin + matches[2].rm_so)); + } break; } } else if(!regexec(&AddHeader, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: AddHeader config: out of memory - aborted", n_lin); - exit(1); + if(res->add_head == NULL) { + if((res->add_head = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("AddHeader config: out of memory - aborted"); + } else { + if((res->add_head = realloc(res->add_head, strlen(res->add_head) + strlen(lin + matches[1].rm_so) + 3)) == NULL) + conf_err("AddHeader config: out of memory - aborted"); + strcat(res->add_head, "\r\n"); + strcat(res->add_head, lin + matches[1].rm_so); } } else if(!regexec(&Ciphers, lin, 4, matches, 0)) { + has_other = 1; + if(res->ctx == NULL) + conf_err("Ciphers may only be used after Cert - aborted"); lin[matches[1].rm_eo] = '\0'; - SSL_CTX_set_cipher_list(res->ctx, lin + matches[1].rm_so); + for(pc = res->ctx; pc; pc = pc->next) + SSL_CTX_set_cipher_list(pc->ctx, lin + matches[1].rm_so); } else if(!regexec(&CAlist, lin, 4, matches, 0)) { STACK_OF(X509_NAME) cert_names; - lin[matches[1].rm_eo] = '\0'; - if((cert_names = SSL_load_client_CA_file(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: SSL_load_client_CA_file \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - SSL_CTX_set_client_CA_list(res->ctx, cert_names); + has_other = 1; + if(res->ctx == NULL) + conf_err("CAList may only be used after Cert - aborted"); + lin[matches[1].rm_eo] = '\0'; + if((cert_names = SSL_load_client_CA_file(lin + matches[1].rm_so)) == NULL) + conf_err("SSL_load_client_CA_file failed - aborted"); + for(pc = res->ctx; pc; pc = pc->next) + SSL_CTX_set_client_CA_list(pc->ctx, cert_names); } else if(!regexec(&VerifyList, lin, 4, matches, 0)) { - lin[matches[1].rm_eo] = '\0'; - if(SSL_CTX_load_verify_locations(res->ctx, lin + matches[1].rm_so, NULL) != 1) { - logmsg(LOG_ERR, "line %d: SSL_CTX_load_verify_locations \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } + has_other = 1; + if(res->ctx == NULL) + conf_err("VerifyList may only be used after Cert - aborted"); + lin[matches[1].rm_eo] = '\0'; + for(pc = res->ctx; pc; pc = pc->next) + if(SSL_CTX_load_verify_locations(pc->ctx, lin + matches[1].rm_so, NULL) != 1) + conf_err("SSL_CTX_load_verify_locations failed - aborted"); } else if(!regexec(&CRLlist, lin, 4, matches, 0)) { #if HAVE_X509_STORE_SET_FLAGS X509_STORE store; X509_LOOKUP lookup; - lin[matches[1].rm_eo] = '\0'; - store = SSL_CTX_get_cert_store(res->ctx); - if((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file())) == NULL) { - logmsg(LOG_ERR, "line %d: X509_STORE_add_lookup \"%s\" failed - aborted", n_lin, - lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); - } - if(X509_load_crl_file(lookup, lin + matches[1].rm_so, X509_FILETYPE_PEM) != 1) { - logmsg(LOG_ERR, "line %d: X509_load_crl_file \"%s\" failed - aborted", n_lin, lin + matches[1].rm_so); - logmsg(LOG_ERR, "%s", ERR_error_string(ERR_get_error(), NULL)); - exit(1); + has_other = 1; + if(res->ctx == NULL) + conf_err("CRLlist may only be used after Cert - aborted"); + lin[matches[1].rm_eo] = '\0'; + for(pc = res->ctx; pc; pc = pc->next) { + store = SSL_CTX_get_cert_store(pc->ctx); + if((lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file())) == NULL) + conf_err("X509_STORE_add_lookup failed - aborted"); + if(X509_load_crl_file(lookup, lin + matches[1].rm_so, X509_FILETYPE_PEM) != 1) + conf_err("X509_load_crl_file failed - aborted"); + X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK \| X509_V_FLAG_CRL_CHECK_ALL); } - X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK \| X509_V_FLAG_CRL_CHECK_ALL); #else - logmsg(LOG_ERR, "line %d: your version of OpenSSL does not support CRL checking", n_lin); + conf_err("your version of OpenSSL does not support CRL checking"); #endif } else if(!regexec(&NoHTTPS11, lin, 4, matches, 0)) { res->noHTTPS11 = atoi(lin + matches[1].rm_so); } else if(!regexec(&Service, lin, 4, matches, 0)) { if(res->services == NULL) - res->services = parse_service(f_conf, NULL); + res->services = parse_service(NULL); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, NULL); + svc->next = parse_service(NULL); } } else if(!regexec(&ServiceName, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(res->services == NULL) - res->services = parse_service(f_conf, lin + matches[1].rm_so); + res->services = parse_service(lin + matches[1].rm_so); else { for(svc = res->services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, lin + matches[1].rm_so); + svc->next = parse_service(lin + matches[1].rm_so); } } else if(!regexec(&End, lin, 4, matches, 0)) { X509_STORE store; - if(!has_addr \|\| !has_port \|\| !has_cert) { - logmsg(LOG_ERR, "line %d: ListenHTTPS missing Address, Port or Certificate - aborted", n_lin); - exit(1); + if(!has_addr \|\| !has_port \|\| res->ctx == NULL) + conf_err("ListenHTTPS missing Address, Port or Certificate - aborted"); +#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB + if(!SSL_CTX_set_tlsext_servername_callback(res->ctx->ctx, SNI_server_name) + \|\| !SSL_CTX_set_tlsext_servername_arg(res->ctx->ctx, res->ctx)) + conf_err("ListenHTTPS: can't set SNI callback"); +#endif + for(pc = res->ctx; pc; pc = pc->next) { + SSL_CTX_set_mode(pc->ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_options(pc->ctx, SSL_OP_ALL); + sprintf(lin, "%d-Pound-%ld", getpid(), random()); + SSL_CTX_set_session_id_context(pc->ctx, (unsigned char )lin, strlen(lin)); + SSL_CTX_set_tmp_rsa_callback(pc->ctx, RSA_tmp_callback); + SSL_CTX_set_tmp_dh_callback(pc->ctx, DH_tmp_callback); } - SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_options(res->ctx, SSL_OP_ALL); - sprintf(lin, "%d-Pound-%ld", getpid(), random()); - SSL_CTX_set_session_id_context(res->ctx, (unsigned char )lin, strlen(lin)); - SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback); return res; } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive"); } } - logmsg(LOG_ERR, "line %d: ListenHTTPS premature EOF", n_lin); - exit(1); + conf_err("ListenHTTPS premature EOF"); return NULL; } @@ -1064,7 +1126,7 @@ parse the config file / static void -parse_file(FILE const f_conf) +parse_file(void) { char lin[MAXBUF]; SERVICE svc; @@ -1074,33 +1136,25 @@ ENGINE e; #endif - while(fgets(lin, MAXBUF, f_conf)) { - n_lin++; + while(conf_fgets(lin, MAXBUF)) { if(strlen(lin) > 0 && lin[strlen(lin) - 1] == '\n') lin[strlen(lin) - 1] = '\0'; - if(!regexec(&Empty, lin, 4, matches, 0) \|\| !regexec(&Comment, lin, 4, matches, 0)) { - /* comment or empty line / - continue; - } else if(!regexec(&User, lin, 4, matches, 0)) { + if(!regexec(&User, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((user = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: User config: out of memory - aborted", n_lin); - exit(1); - } + if((user = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("User config: out of memory - aborted"); } else if(!regexec(&Group, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((group = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: Group config: out of memory - aborted", n_lin); - exit(1); - } + if((group = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("Group config: out of memory - aborted"); } else if(!regexec(&RootJail, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; - if((root_jail = strdup(lin + matches[1].rm_so)) == NULL) { - logmsg(LOG_ERR, "line %d: RootJail config: out of memory - aborted", n_lin); - exit(1); - } + if((root_jail = strdup(lin + matches[1].rm_so)) == NULL) + conf_err("RootJail config: out of memory - aborted"); } else if(!regexec(&Daemon, lin, 4, matches, 0)) { daemonize = atoi(lin + matches[1].rm_so); + } else if(!regexec(&Threads, lin, 4, matches, 0)) { + numthreads = atoi(lin + matches[1].rm_so); } else if(!regexec(&LogFacility, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(lin[matches[1].rm_so] == '-') @@ -1123,72 +1177,69 @@ dynscale = atoi(lin + matches[1].rm_so); } else if(!regexec(&TimeOut, lin, 4, matches, 0)) { be_to = atoi(lin + matches[1].rm_so); + } else if(!regexec(&ConnTO, lin, 4, matches, 0)) { + be_connto = atoi(lin + matches[1].rm_so); + } else if(!regexec(&IgnoreCase, lin, 4, matches, 0)) { + ignore_case = atoi(lin + matches[1].rm_so); #if HAVE_OPENSSL_ENGINE_H } else if(!regexec(&SSLEngine, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; #if OPENSSL_VERSION_NUMBER >= 0x00907000L ENGINE_load_builtin_engines(); #endif - if (!(e = ENGINE_by_id(lin + matches[1].rm_so))) { - logmsg(LOG_ERR, "line %d: could not find %s engine", n_lin, lin + matches[1].rm_so); - exit(1); - } + if (!(e = ENGINE_by_id(lin + matches[1].rm_so))) + conf_err("could not find engine"); if(!ENGINE_init(e)) { ENGINE_free(e); - logmsg(LOG_ERR, "line %d: could not init %s engine", n_lin, lin + matches[1].rm_so); - exit(1); + conf_err("could not init engine"); } if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { ENGINE_free(e); - logmsg(LOG_ERR, "line %d: could not set all defaults", n_lin); - exit(1); + conf_err("could not set all defaults"); } ENGINE_finish(e); ENGINE_free(e); #endif } else if(!regexec(&Control, lin, 4, matches, 0)) { - if(ctrl_name != NULL) { - logmsg(LOG_ERR, "line %d: Control multiply defined - aborted", n_lin); - exit(1); - } + if(ctrl_name != NULL) + conf_err("Control multiply defined - aborted"); lin[matches[1].rm_eo] = '\0'; ctrl_name = strdup(lin + matches[1].rm_so); } else if(!regexec(&ListenHTTP, lin, 4, matches, 0)) { if(listeners == NULL) - listeners = parse_HTTP(f_conf); + listeners = parse_HTTP(); else { for(lstn = listeners; lstn->next; lstn = lstn->next) ; - lstn->next = parse_HTTP(f_conf); + lstn->next = parse_HTTP(); } } else if(!regexec(&ListenHTTPS, lin, 4, matches, 0)) { if(listeners == NULL) - listeners = parse_HTTPS(f_conf); + listeners = parse_HTTPS(); else { for(lstn = listeners; lstn->next; lstn = lstn->next) ; - lstn->next = parse_HTTPS(f_conf); + lstn->next = parse_HTTPS(); } } else if(!regexec(&Service, lin, 4, matches, 0)) { if(services == NULL) - services = parse_service(f_conf, NULL); + services = parse_service(NULL); else { for(svc = services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, NULL); + svc->next = parse_service(NULL); } } else if(!regexec(&ServiceName, lin, 4, matches, 0)) { lin[matches[1].rm_eo] = '\0'; if(services == NULL) - services = parse_service(f_conf, lin + matches[1].rm_so); + services = parse_service(lin + matches[1].rm_so); else { for(svc = services; svc->next; svc = svc->next) ; - svc->next = parse_service(f_conf, lin + matches[1].rm_so); + svc->next = parse_service(lin + matches[1].rm_so); } } else { - logmsg(LOG_ERR, "line %d: unknown directive \"%s\" - aborted", n_lin, lin); - exit(1); + conf_err("unknown directive - aborted"); } } return; @@ -1210,6 +1261,7 @@ \|\| regcomp(&Group, "^[ \t]Group[ \t]+\"(.+)\"[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&RootJail, "^[ \t]RootJail[ \t]+\"(.+)\"[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&Daemon, "^[ \t]Daemon[ \t]+([01])[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&Threads, "^[ \t]Threads[ \t]+([1-9][0-9])[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&LogFacility, "^[ \t]LogFacility[ \t]+([a-z0-9-]+)[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&LogLevel, "^[ \t]LogLevel[ \t]+([0-5])[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&Grace, "^[ \t]Grace[ \t]+([0-9]+)[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) @@ -1258,6 +1310,13 @@ \|\| regcomp(&VerifyList, "^[ \t]VerifyList[ \t]+\"(.+)\"[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&CRLlist, "^[ \t]CRLlist[ \t]+\"(.+)\"[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&NoHTTPS11, "^[ \t]NoHTTPS11[ \t]+([0-2])[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&Include, "^[ \t]Include[ \t]+\"(.+)\"[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&ConnTO, "^[ \t]ConnTO[ \t]+([1-9][0-9])[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&IgnoreCase, "^[ \t]IgnoreCase[ \t]+([01])[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&HTTPS, "^[ \t]HTTPS[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&HTTPSCert, "^[ \t]HTTPS[ \t]+\"(.+)\"[ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&Disabled, "^[ \t]Disabled[ \t]+[01][ \t]$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&CNName, ".[Cc][Nn]=([-.A-Za-z0-9]+).$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) ) { logmsg(LOG_ERR, "bad config Regex - aborted"); exit(1); @@ -1327,16 +1386,14 @@ exit(1); } - if((f_conf = fopen(conf_name, "rt")) == NULL) { - logmsg(LOG_ERR, "can't open configuration file \"%s\" (%s) - aborted", conf_name, strerror(errno)); - exit(1); - } + conf_init(conf_name); user = NULL; group = NULL; root_jail = NULL; ctrl_name = NULL; + numthreads = 128; alive_to = 30; daemonize = 1; grace = 30; @@ -1344,9 +1401,7 @@ services = NULL; listeners = NULL; - parse_file(f_conf); - - fclose(f_conf); + parse_file(); if(check_only) { logmsg(LOG_INFO, "Config file %s is OK", conf_name); @@ -1364,6 +1419,7 @@ regfree(&Group); regfree(&RootJail); regfree(&Daemon); + regfree(&Threads); regfree(&LogFacility); regfree(&LogLevel); regfree(&Grace); @@ -1412,6 +1468,13 @@ regfree(&VerifyList); regfree(&CRLlist); regfree(&NoHTTPS11); + regfree(&Include); + regfree(&ConnTO); + regfree(&IgnoreCase); + regfree(&HTTPS); + regfree(&HTTPSCert); + regfree(&Disabled); + regfree(&CNName); /* set the facility only here to ensure the syslog gets opened if necessary */ log_facility = def_facility;
[-] [+]	Changed	Pound-2.6.tgz/config.h.in ^
@@ -12,6 +12,9 @@ /* Define to 1 if you have the <fcntl.h> header file. / #undef HAVE_FCNTL_H +/ Define to 1 if you have the `long long' type. / +#undef HAVE_LONG_LONG_INT + / Define to 1 if you have the `fork' function. / #undef HAVE_FORK @@ -36,13 +39,12 @@ / Define to 1 if you have the `dl' library (-ldl). / #undef HAVE_LIBDL +/ Define if libpcreposix is available / +#undef HAVE_LIBPCREPOSIX + / Define to 1 if you have the `localtime_r' function. / #undef HAVE_LOCALTIME_R -/ Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. / -#undef HAVE_MALLOC - / Define to 1 if you have the <memory.h> header file. / #undef HAVE_MEMORY_H @@ -229,6 +231,9 @@ / Define to 1 if you can safely include both <sys/time.h> and <time.h>. / #undef TIME_WITH_SYS_TIME +/ Define to 1 if you have the <fnmatch.h> header file. / +#undef HAVE_FNMATCH_H + / Define to empty if `const' does not conform to ANSI C. */ #undef const
[-] [+]	Changed	Pound-2.6.tgz/configure ^
@@ -1,62 +1,85 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pound 2.4.5. +# Generated by GNU Autoconf 2.65 for pound 2.6. # # Report bugs to <roseg@apsis.ch>. # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - posix) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + posix) : + set -o posix ;; #( + ) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + "$as_nl") + expr "X$arg" : "X\\(.\\)$as_nl"; + arg=`expr "X$arg" : ".$as_nl\\(.\\)"`;; + esac; + expr "X$arg" : "X\\(.\\)" \| tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) \|\| exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \|\| + PATH_SEPARATOR=';' + } fi @@ -65,20 +88,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( [\\/] ) as_myself=$0 ;; ) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -89,354 +110,322 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" \|\| -$as_expr X/"$0" : './\([^/][^/]\)/$' \\| \ - X"$0" : 'X\(//\)$' \\| \ - X"$0" : 'X\(/\)' \\| . 2>/dev/null \|\| -echo X/"$0" \| - sed '/^.\/\([^/][^/]\)\/$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\)./{ - s//\1/ - q - } - s/././; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + posix) : + set -o posix ;; #( + ) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success \|\| { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success \|\| { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 \|\| exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' \|\| exit 1 +test \$(( 1 + 1 )) = 2 \|\| exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) \|\| { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") \|\| { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" \|\| test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" \| as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found \|\| { if { test -f "$SHELL" \|\| test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" \|\| test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - posix) set -o posix ;; -esac - + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and roseg@apsis.ch +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - posix) set -o posix ;; -esac - fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi + case $as_dir in #( + -) as_dir=./$as_dir;; + esac + test -d "$as_dir" \|\| eval $as_mkdir_p \|\| { + as_dirs= + while :; do + case $as_dir in #( + \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'( + ) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" \|\| +$as_expr X"$as_dir" : 'X\(.[^/]\)//[^/][^/]/$' \\| \ + X"$as_dir" : 'X\(//\)[^/]' \\| \ + X"$as_dir" : 'X\(//\)$' \\| \ + X"$as_dir" : 'X\(/\)' \\| . 2>/dev/null \|\| +$as_echo X"$as_dir" \| + sed '/^X\(.[^/]\)\/\/[^/][^/]\/$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/]./{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\)./{ + s//\1/ + q + } + s/././; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" \|\| eval "mkdir $as_dirs" + } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir" -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi -if ( set x; as_func_ret_success y && test x = "$1" ); then - : +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) \|\| { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") \|\| { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $ )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" \|\| test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") \|\| { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} +as_me=`$as_basename -- "$0" \|\| +$as_expr X/"$0" : './\([^/][^/]\)/$' \\| \ + X"$0" : 'X\(//\)$' \\| \ + X"$0" : 'X\(/\)' \\| . 2>/dev/null \|\| +$as_echo X/"$0" \| + sed '/^.\/\([^/][^/]\)\/$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\)./{ + s//\1/ + q + } + s/././; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" \|\| { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' \|\| { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -453,8 +442,7 @@ s/-\n.// ' >$as_me.lineno && chmod +x "$as_me.lineno" \|\| - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -464,49 +452,40 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n) - case `echo 'x\c'` in + case `echo 'xy\c'` in c) ECHO_T=' ';; # ECHO_T is single tab character. - ) ECHO_C='\c';; + xy) ECHO_C='\c';; + ) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; ) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -514,7 +493,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -531,12 +510,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -)set "./$1";; + case $1 in #( + -)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]):;;)false;;esac;fi '\'' sh ' @@ -550,8 +529,8 @@ as_tr_sh="eval sed 'y%+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 </dev/null 6>&1 +test -n "$DJDIR" \|\| exec 7<&0 </dev/null +exec 6>&1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -569,14 +548,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pound' PACKAGE_TARNAME='pound' -PACKAGE_VERSION='2.4.5' -PACKAGE_STRING='pound 2.4.5' +PACKAGE_VERSION='2.6' +PACKAGE_STRING='pound 2.6' PACKAGE_BUGREPORT='roseg@apsis.ch' +PACKAGE_URL='' ac_unique_file="pound.c" # Factoring default headers for most tests. @@ -594,105 +573,119 @@ #else # ifdef HAVE_STDLIB_H # include <stdlib.h> -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include <memory.h> -# endif -# include <string.h> -#endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -#endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif" - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -acx_pthread_config -PTHREAD_CC -PTHREAD_LIBS -PTHREAD_CFLAGS -C_SSL -C_T_RSA -C_MAXBUF -C_OWNER -C_GROUP -C_SUPER -C_CERT1L -CPP -GREP -EGREP -LIBOBJS -I_OWNER +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include <memory.h> +# endif +# include <string.h> +#endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#endif +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif" + +ac_subst_vars='LTLIBOBJS I_GRP -LTLIBOBJS' +I_OWNER +LIBOBJS +EGREP +GREP +CPP +C_CERT1L +C_SUPER +C_GROUP +C_OWNER +C_MAXBUF +C_T_RSA +C_SSL +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +acx_pthread_config +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_ssl +with_t_rsa +with_maxbuf +with_owner +with_group +enable_super +enable_cert1l +enable_pcreposix +enable_tcmalloc +enable_hoard +' ac_precious_vars='build_alias host_alias target_alias @@ -707,6 +700,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -805,13 +800,20 @@ datarootdir=$ac_optarg ;; -disable-* \| --disable-) - ac_feature=`expr "x$ac_option" : 'x-disable-\(.\)'` + ac_useropt=`expr "x$ac_option" : 'x-disable-\(.\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature \| sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` + case $ac_user_opts in + " +"enable_$ac_useropt" +") ;; + ) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir \| --docdir \| --docdi \| --doc \| --do) ac_prev=docdir ;; @@ -824,13 +826,20 @@ dvidir=$ac_optarg ;; -enable-* \| --enable-) - ac_feature=`expr "x$ac_option" : 'x-enable-\([^=]\)'` + ac_useropt=`expr "x$ac_option" : 'x-enable-\([^=]\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature \| sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` + case $ac_user_opts in + " +"enable_$ac_useropt" +") ;; + ) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix \| --exec_prefix \| --exec-prefix \| --exec-prefi \ \| --exec-pref \| --exec-pre \| --exec-pr \| --exec-p \| --exec- \ @@ -1021,22 +1030,36 @@ ac_init_version=: ;; -with-* \| --with-) - ac_package=`expr "x$ac_option" : 'x-with-\([^=]\)'` + ac_useropt=`expr "x$ac_option" : 'x-with-\([^=]\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package \| sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` + case $ac_user_opts in + " +"with_$ac_useropt" +") ;; + ) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* \| --without-) - ac_package=`expr "x$ac_option" : 'x-without-\(.\)'` + ac_useropt=`expr "x$ac_option" : 'x-without-\(.\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package \| sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` + case $ac_user_opts in + " +"with_$ac_useropt" +") ;; + ) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1056,25 +1079,25 @@ \| --x-librar=* \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=) x_libraries=$ac_optarg ;; - -) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; =) ac_envvar=`expr "x$ac_option" : 'x\([^=]\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' \| [0-9] \| [!_$as_cr_alnum] ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; ) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1083,23 +1106,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev \| sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + ) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + / ) + ac_val=`expr "X$ac_val" : 'X\(.[^/]\)' \\| "X$ac_val" : 'X\(.\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* \| ?:[\\/]* ) continue;; NONE \| '' ) case $ac_var in prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1113,7 +1149,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1129,23 +1165,21 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\| - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\| - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" \|\| -$as_expr X"$0" : 'X\(.[^/]\)//[^/][^/]/$' \\| \ - X"$0" : 'X\(//\)[^/]' \\| \ - X"$0" : 'X\(//\)$' \\| \ - X"$0" : 'X\(/\)' \\| . 2>/dev/null \|\| -echo X"$0" \| + ac_confdir=`$as_dirname -- "$as_myself" \|\| +$as_expr X"$as_myself" : 'X\(.[^/]\)//[^/][^/]/$' \\| \ + X"$as_myself" : 'X\(//\)[^/]' \\| \ + X"$as_myself" : 'X\(//\)$' \\| \ + X"$as_myself" : 'X\(/\)' \\| . 2>/dev/null \|\| +$as_echo X"$as_myself" \| sed '/^X\(.[^/]\)\/\/[^/][^/]\/$/{ s//\1/ q @@ -1172,13 +1206,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" \|\| { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1204,7 +1236,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pound 2.4.5 to adapt to many kinds of systems. +\`configure' configures pound 2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1226,9 +1258,9 @@ 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 @@ -1238,25 +1270,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/pound] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/pound] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1270,17 +1302,24 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of pound 2.4.5:";; + short \| recursive ) echo "Configuration of pound 2.6:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-super enable or disable running with supervisor process (default: enabled) --enable-cert1l enable or disable single-line certificate (default: disabled) + --enable-pcreposix enable or disable using the pcreposix library + (default: enabled if available) + --enable-tcmalloc enable or disable using the tcmalloc library + (default: enabled if available) + --enable-hoard enable or disable using the hoard library (default: + enabled if available and tcmalloc NOT available) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1298,90 +1337,503 @@ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> LIBS libraries to pass to the linker, e.g. -l<library> - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to <roseg@apsis.ch>. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" \|\| + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } \|\| + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +) + ac_dir_suffix=/`$as_echo "$ac_dir" \| sed 's\|^\.[\\/]\|\|'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" \| sed 's\|/[^\\/]\|/..\|g;s\|/\|\|'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + ) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* \| ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + ) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" \|\| { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi \|\| ac_status=$? + cd "$ac_pwd" \|\| { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +pound configure 2.6 +generated by GNU Autoconf 2.65 + +Copyright (C) 2009 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + \"* \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ +' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" \|\| + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/\| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + \" \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ +' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" \|\| + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes \|\| + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/\| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + \" \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ +' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/\| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables can be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + \" \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + \"* \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/\| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/ end confdefs.h. / +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/ end confdefs.h. / +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ----------------------------- ## +## Report this to roseg@apsis.ch ## +## ----------------------------- ## +_ASBOX + ) \| sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel -Report bugs to <roseg@apsis.ch>. +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. / +$4 +#include <$2> _ACEOF -ac_status=$? +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" \|\| continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -) - ac_dir_suffix=/`echo "$ac_dir" \| sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" \| sed 's,/[^\\/],/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - ) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +} # ac_fn_c_check_header_compile -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* \| ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - ) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/ end confdefs.h. / +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/ end confdefs.h. / +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : - cd "$ac_dir" \|\| { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi \|\| ac_status=$? - cd "$ac_pwd" \|\| { ac_status=$?; break; } - done +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/ end confdefs.h. / +/ Define $2 to an innocuous variant, in case <limits.h> declares $2. + For example, HP-UX 11i <limits.h> declares gettimeofday. / +#define $2 innocuous_$2 -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -pound configure 2.4.5 -generated by GNU Autoconf 2.61 +/ System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. / -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $2 + +/ Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. / +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/ The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. / +#if defined __stub_$2 \|\| defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF - exit +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pound $as_me 2.4.5, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by pound $as_me 2.6, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1417,8 +1869,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1452,12 +1904,12 @@ \| -silent \| --silent \| --silen \| --sile \| --sil) continue ;; \') - ac_arg=`echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1473,13 +1925,13 @@ - ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 \|\| test "${ac_configure_args0+set}" != set \|\| { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 \|\| test "${ac_configure_args1+set}" != set \|\| { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1504,12 +1956,13 @@ case $ac_val in #( ${as_nl}) case $ac_var in #( - _cv_) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ \| IFS \| as_nl) ;; #( - ) $as_unset $ac_var ;; + BASH_ARGV \| BASH_SOURCE) eval $ac_var= ;; #( + ) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1538,9 +1991,9 @@ do eval ac_val=\$$ac_var case $ac_val in - \'\'') ac_val=`echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + \'\'') ac_val=`$as_echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done \| sort echo @@ -1555,9 +2008,9 @@ do eval ac_val=\$$ac_var case $ac_val in - \'\'') ac_val=`echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + \'\'') ac_val=`$as_echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done \| sort echo fi @@ -1573,83 +2026,88 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core .core core.conftest. && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h /" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/\| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/] \| ?:[\\/]* ) . "$cache_file";; ) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1663,68 +2121,56 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; ) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - \') ac_arg=$ac_var=`echo "$ac_new_val" \| sed "s/'/'\\\\\\\\''/g"` ;; + \') ac_arg=$ac_var=`$as_echo "$ac_new_val" \| sed "s/'/'\\\\\\\\''/g"` ;; ) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in " '$ac_arg' ") ;; # Avoid dups. Use of quotes ensures accuracy. - ) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + ) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1746,10 +2192,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1759,25 +2205,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1786,10 +2232,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1799,25 +2245,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -1825,12 +2271,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -1843,10 +2285,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1856,25 +2298,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1883,10 +2325,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1897,18 +2339,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -1927,11 +2369,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1942,10 +2384,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1955,25 +2397,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1986,10 +2428,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1999,25 +2441,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2029,12 +2471,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2044,51 +2482,37 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in \"* \| \` \| \\) ac_try_echo=\$ac_try;; ) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -2100,42 +2524,38 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" \| sed 's/ -o conftest[^ ]//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" \| sed 's/ -o conftest[^ ]//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest." + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .o \| .obj ) ;; + .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM \| .o \| .obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in \" \| \` \| \\) ac_try_echo=\$ac_try;; ) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2145,14 +2565,14 @@ do test -f "$ac_file" \|\| continue case $ac_file in - .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .o \| .obj ) + .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM \| .o \| .obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; . ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]\(\..\)'` fi @@ -2171,78 +2591,42 @@ else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/\| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_try" in \"* \| \` \| \\) ac_try_echo=\$ac_try;; ) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2250,37 +2634,90 @@ for ac_file in conftest.exe conftest conftest.; do test -f "$ac_file" \|\| continue case $ac_file in - .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .o \| .obj ) ;; + .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM \| .o \| .obj ) ;; .* ) ac_cv_exeext=`expr "$ac_file" : '[^.]\(\..\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. / +#include <stdio.h> +int +main () +{ +FILE f = fopen ("conftest.out", "w"); + return ferror (f) \|\| fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + \" \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + \"* \| \` \| \\) ac_try_echo=\$ac_try;; + ) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -2292,51 +2729,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in \"* \| \` \| \\) ac_try_echo=\$ac_try;; ) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.; do test -f "$ac_file" \|\| continue; case $ac_file in - .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf ) ;; + .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM ) ;; ) ac_cv_objext=`expr "$ac_file" : '.\.\(.\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/\| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -2350,54 +2782,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -2408,34 +2820,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -2446,35 +2835,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -2485,42 +2851,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2536,18 +2878,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <stdarg.h> #include <stdio.h> @@ -2604,31 +2942,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -2639,17 +2955,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; ) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2659,24 +2977,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2701,22 +3011,23 @@ # 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; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ \| .// \| /cC/ \| \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ \| .// \| /[cC]/* \| \ /etc/* \| /usr/sbin/* \| /usr/etc/* \| /sbin/* \| /usr/afsws/bin/* \| \ - ?:\\/os2\\/install\\/* \| ?:\\/OS2\\/INSTALL\\/* \| \ + ?:[\\/]os2[\\/]install[\\/]* \| ?:[\\/]OS2[\\/]INSTALL[\\/]* \| \ /usr/ucb/* ) ;; ) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2734,17 +3045,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -2757,8 +3080,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2770,35 +3093,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\| - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\| - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in --) ;; -) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2814,28 +3129,24 @@ case $build_os in \ ) build_os=`echo "$build_os" \| sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\| - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in --) ;; -) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2851,28 +3162,24 @@ case $host_os in \ ) host_os=`echo "$host_os" \| sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if test "${ac_cv_target+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` \|\| - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } case $ac_cv_target in --) ;; -) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; +) as_fn_error "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2905,7 +3212,7 @@ # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# Foobar is distributed in the hope that it will be useful, +# Pound is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -2925,11 +3232,11 @@ if test "${CC}" = "gcc" then - CPPFLAGS="${CPPFLAGS} -Wstrict-prototypes -pipe" + CPPFLAGS="${CPPFLAGS} -Wstrict-prototypes -Wno-unused-result -pipe" fi -{ echo "$as_me:$LINENO: * Checking for threads library and/or flags " >&5 -echo "$as_me: Checking for threads library and/or flags " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking for threads library and/or flags " >&5 +$as_echo "$as_me: Checking for threads library and/or flags " >&6;} @@ -2956,13 +3263,9 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -2980,36 +3283,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } if test x"$acx_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -3069,23 +3349,23 @@ case $flag in none) - { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 -echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } ;; -) - { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 -echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$acx_pthread_config"; then ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. @@ -3095,14 +3375,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_acx_pthread_config="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" @@ -3110,11 +3390,11 @@ fi acx_pthread_config=$ac_cv_prog_acx_pthread_config if test -n "$acx_pthread_config"; then - { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5 -echo "${ECHO_T}$acx_pthread_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 +$as_echo "$acx_pthread_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3124,8 +3404,8 @@ ;; ) - { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 -echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } PTHREAD_LIBS="-l$flag" ;; esac @@ -3144,11 +3424,7 @@ # pthread_cleanup_push because it is one of the few pthread # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <pthread.h> int @@ -3161,40 +3437,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } if test "x$acx_pthread_ok" = xyes; then break; fi @@ -3213,13 +3466,9 @@ # Detect AIX lossage: threads are created detached by default # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 -echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <pthread.h> int @@ -3230,40 +3479,15 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ok=PTHREAD_CREATE_JOINABLE else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ok=unknown + ok=unknown fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xunknown; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <pthread.h> int @@ -3274,58 +3498,35 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ok=PTHREAD_CREATE_UNDETACHED else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ok=unknown + ok=unknown fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then -cat >>confdefs.h <<\_ACEOF -#define PTHREAD_CREATE_JOINABLE $ok -_ACEOF +$as_echo "#define PTHREAD_CREATE_JOINABLE \$ok" >>confdefs.h fi - { echo "$as_me:$LINENO: result: ${ok}" >&5 -echo "${ECHO_T}${ok}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ok}" >&5 +$as_echo "${ok}" >&6; } if test x"$ok" = xunknown; then - { echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5 -echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: we do not know how to create joinable pthreads" >&5 +$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} fi - { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 -echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } flag=no case "${host_cpu}-${host_os}" in -aix \| -freebsd) flag="-D_THREAD_SAFE";; solaris \| -osf \| -hpux) flag="-D_REENTRANT";; esac - { echo "$as_me:$LINENO: result: ${flag}" >&5 -echo "${ECHO_T}${flag}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi @@ -3336,10 +3537,10 @@ # More AIX lossage: must compile with cc_r # Extract the first word of "cc_r", so it can be a program name with args. set dummy cc_r; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. @@ -3349,14 +3550,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_PTHREAD_CC="cc_r" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" @@ -3364,11 +3565,11 @@ fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 -echo "${ECHO_T}$PTHREAD_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3396,12 +3597,12 @@ -{ echo "$as_me:$LINENO: * Parsing options " >&5 -echo "$as_me: Parsing options " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Parsing options " >&5 +$as_echo "$as_me: Parsing options " >&6;} # Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then +if test "${with_ssl+set}" = set; then : withval=$with_ssl; CPPFLAGS="-I${with_ssl}/include ${CPPFLAGS}"; LDFLAGS="-L${with_ssl}/lib ${LDFLAGS}"; C_SSL="${with_ssl}" else C_SSL="" @@ -3411,7 +3612,7 @@ # Check whether --with-t_rsa was given. -if test "${with_t_rsa+set}" = set; then +if test "${with_t_rsa+set}" = set; then : withval=$with_t_rsa; CPPFLAGS="-DT_RSA_KEYS=${with_t_rsa} ${CPPFLAGS}"; C_T_RSA="${with_t_rsa}" else C_T_RSA="0" @@ -3421,7 +3622,7 @@ # Check whether --with-maxbuf was given. -if test "${with_maxbuf+set}" = set; then +if test "${with_maxbuf+set}" = set; then : withval=$with_maxbuf; CPPFLAGS="-DMAXBUF=${with_maxbuf} ${CPPFLAGS}"; C_MAXBUF="${with_maxbuf}" else C_MAXBUF="0" @@ -3432,7 +3633,7 @@ I_OWNER="" # Check whether --with-owner was given. -if test "${with_owner+set}" = set; then +if test "${with_owner+set}" = set; then : withval=$with_owner; I_OWNER="${with_owner}"; C_OWNER="${with_owner}" else C_OWNER="" @@ -3443,7 +3644,7 @@ I_GRP="" # Check whether --with-group was given. -if test "${with_group+set}" = set; then +if test "${with_group+set}" = set; then : withval=$with_group; I_GRP="${with_group}"; C_GROUP="${with_group}" else C_GROUP="" @@ -3452,7 +3653,7 @@ # Check whether --enable-super was given. -if test "${enable_super+set}" = set; then +if test "${enable_super+set}" = set; then : enableval=$enable_super; test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DUPER"; C_SUPER="1" else CFLAGS="${CFLAGS} -DUPER"; C_SUPER="0" @@ -3461,31 +3662,47 @@ # Check whether --enable-cert1l was given. -if test "${enable_cert1l+set}" = set; then +if test "${enable_cert1l+set}" = set; then : enableval=$enable_cert1l; test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DCERT1L"; C_CERT1L="1" +fi + + + +# Check whether --enable-pcreposix was given. +if test "${enable_pcreposix+set}" = set; then : + enableval=$enable_pcreposix; C_PCREPOSIX=${enableval} +else + C_PCREPOSIX=yes +fi + + +# Check whether --enable-tcmalloc was given. +if test "${enable_tcmalloc+set}" = set; then : + enableval=$enable_tcmalloc; C_TCMALLOC=${enableval} else - C_CERT1L="0" + C_TCMALLOC=yes fi +# Check whether --enable-hoard was given. +if test "${enable_hoard+set}" = set; then : + enableval=$enable_hoard; C_HOARD=${enableval} +else + C_HOARD=yes +fi -{ echo "$as_me:$LINENO: Checking for libraries " >&5 -echo "$as_me: Checking for libraries " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking for libraries " >&5 +$as_echo "$as_me: Checking for libraries " >&6;} LIBS="${LIBS} -lm" - -{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3503,39 +3720,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBDL 1 _ACEOF @@ -3544,18 +3740,14 @@ fi -{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_socket+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3573,54 +3765,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } -if test $ac_cv_lib_socket_socket = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = x""yes; then : LIBS="-lsocket -lnsl ${LIBS}" fi -{ echo "$as_me:$LINENO: checking for hstrerror in -lresolv" >&5 -echo $ECHO_N "checking for hstrerror in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv_hstrerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror in -lresolv" >&5 +$as_echo_n "checking for hstrerror in -lresolv... " >&6; } +if test "${ac_cv_lib_resolv_hstrerror+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3638,54 +3805,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_resolv_hstrerror=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_resolv_hstrerror=no + ac_cv_lib_resolv_hstrerror=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_hstrerror" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_hstrerror" >&6; } -if test $ac_cv_lib_resolv_hstrerror = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_hstrerror" >&5 +$as_echo "$ac_cv_lib_resolv_hstrerror" >&6; } +if test "x$ac_cv_lib_resolv_hstrerror" = x""yes; then : LIBS="-lresolv ${LIBS}" fi -{ echo "$as_me:$LINENO: checking for BIO_new in -lcrypto" >&5 -echo $ECHO_N "checking for BIO_new in -lcrypto... $ECHO_C" >&6; } -if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_new in -lcrypto" >&5 +$as_echo_n "checking for BIO_new in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3703,56 +3845,31 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_crypto_BIO_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_crypto_BIO_new=no + ac_cv_lib_crypto_BIO_new=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_new" >&5 -echo "${ECHO_T}$ac_cv_lib_crypto_BIO_new" >&6; } -if test $ac_cv_lib_crypto_BIO_new = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_new" >&5 +$as_echo "$ac_cv_lib_crypto_BIO_new" >&6; } +if test "x$ac_cv_lib_crypto_BIO_new" = x""yes; then : LIBS="-lcrypto ${LIBS}" else echo 'Missing OpenSSL (-lcrypto) - aborted'; exit 1 fi -{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5 -echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 +$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } +if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3770,56 +3887,32 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ssl_SSL_CTX_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_ssl_SSL_CTX_new=no + ac_cv_lib_ssl_SSL_CTX_new=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; } -if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } +if test "x$ac_cv_lib_ssl_SSL_CTX_new" = x""yes; then : LIBS="-lssl ${LIBS}" else echo 'Missing OpenSSL (-lssl) - aborted'; exit 1 fi -{ echo "$as_me:$LINENO: checking for regcomp in -lpcreposix" >&5 -echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6; } -if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test x"$C_PCREPOSIX" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lpcreposix" >&5 +$as_echo_n "checking for regcomp in -lpcreposix... " >&6; } +if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3837,56 +3930,33 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pcreposix_regcomp=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_pcreposix_regcomp=no + ac_cv_lib_pcreposix_regcomp=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcreposix_regcomp" >&5 -echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6; } -if test $ac_cv_lib_pcreposix_regcomp = yes; then - LIBS="-lpcreposix ${LIBS}" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcreposix_regcomp" >&5 +$as_echo "$ac_cv_lib_pcreposix_regcomp" >&6; } +if test "x$ac_cv_lib_pcreposix_regcomp" = x""yes; then : + LIBS="-lpcreposix ${LIBS}"; +$as_echo "#define HAVE_LIBPCREPOSIX 1" >>confdefs.h + else save_LIBS="$LIBS" LIBS="-lpcre $LIBS" - { echo "$as_me:$LINENO: checking for regexec in -lpcreposix" >&5 -echo $ECHO_N "checking for regexec in -lpcreposix... $ECHO_C" >&6; } -if test "${ac_cv_lib_pcreposix_regexec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regexec in -lpcreposix" >&5 +$as_echo_n "checking for regexec in -lpcreposix... " >&6; } +if test "${ac_cv_lib_pcreposix_regexec+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3904,40 +3974,21 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pcreposix_regexec=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_pcreposix_regexec=no + ac_cv_lib_pcreposix_regexec=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcreposix_regexec" >&5 -echo "${ECHO_T}$ac_cv_lib_pcreposix_regexec" >&6; } -if test $ac_cv_lib_pcreposix_regexec = yes; then - LIBS="-lpcreposix -lpcre $save_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcreposix_regexec" >&5 +$as_echo "$ac_cv_lib_pcreposix_regexec" >&6; } +if test "x$ac_cv_lib_pcreposix_regexec" = x""yes; then : + LIBS="-lpcreposix -lpcre $save_LIBS"; +$as_echo "#define HAVE_LIBPCREPOSIX 1" >>confdefs.h + else LIBS="$save_LIBS" fi @@ -3945,18 +3996,16 @@ fi -{ echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 -echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6; } -if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +if test x"$C_TCMALLOC" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5 +$as_echo_n "checking for malloc in -ltcmalloc... " >&6; } +if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltcmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -3974,55 +4023,31 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tcmalloc_malloc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_tcmalloc_malloc=no + ac_cv_lib_tcmalloc_malloc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6; } -if test $ac_cv_lib_tcmalloc_malloc = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5 +$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; } +if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then : LIBS="${LIBS} -ltcmalloc" fi -if test "${ac_cv_lib_tcmalloc_malloc}" = "no"; then -{ echo "$as_me:$LINENO: checking for malloc in -lhoard" >&5 -echo $ECHO_N "checking for malloc in -lhoard... $ECHO_C" >&6; } -if test "${ac_cv_lib_hoard_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +else +if test x"$C_HOARD" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lhoard" >&5 +$as_echo_n "checking for malloc in -lhoard... " >&6; } +if test "${ac_cv_lib_hoard_malloc+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhoard $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -4040,51 +4065,27 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_hoard_malloc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_hoard_malloc=no + ac_cv_lib_hoard_malloc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hoard_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_hoard_malloc" >&6; } -if test $ac_cv_lib_hoard_malloc = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5 +$as_echo "$ac_cv_lib_hoard_malloc" >&6; } +if test "x$ac_cv_lib_hoard_malloc" = x""yes; then : LIBS="${LIBS} -lhoard" fi fi +fi -{ echo "$as_me:$LINENO: checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS" >&5 -echo $ECHO_N "checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS" >&5 +$as_echo_n "checking for pthread_attr_setstacksize in LIBS=$LIBS with CFLAGS=$CFLAGS... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -4100,56 +4101,33 @@ return pthread_attr_setstacksize (); ; return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : CFLAGS="${CFLAGS} -DNEED_STACK" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } - -{ echo "$as_me:$LINENO: * Checking for header files " >&5 -echo "$as_me: Checking for header files " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking for header files " >&5 +$as_echo "$as_me: Checking for header files " >&6;} ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -4163,11 +4141,7 @@ # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #ifdef __STDC__ # include <limits.h> @@ -4176,76 +4150,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -4257,8 +4189,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -4268,11 +4200,7 @@ # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #ifdef __STDC__ # include <limits.h> @@ -4281,83 +4209,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -4367,45 +4252,40 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in GNU) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4417,77 +4297,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in GNU) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4499,46 +4363,31 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <stdlib.h> #include <stdarg.h> @@ -4553,47 +4402,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \| - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4603,18 +4428,14 @@ 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \| - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4624,14 +4445,10 @@ 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 + 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <ctype.h> #include <stdlib.h> @@ -4658,113 +4475,36 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - 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 core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF fi @@ -4772,174 +4512,14 @@ done - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -for ac_header in arpa/inet.h errno.h netdb.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/un.h sys/time.h unistd.h getopt.h pthread.h sys/types.h sys/poll.h openssl/ssl.h openssl/engine.h time.h pwd.h grp.h signal.h regex.h ctype.h wait.h sys/wait.h sys/stat.h fcntl.h stdarg.h pcreposix.h pcre/pcreposix.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) \| sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +for ac_header in arpa/inet.h errno.h netdb.h netinet/in.h netinet/tcp.h stdlib.h string.h sys/socket.h sys/un.h sys/time.h unistd.h getopt.h pthread.h sys/types.h sys/poll.h openssl/ssl.h openssl/engine.h time.h pwd.h grp.h signal.h regex.h ctype.h wait.h sys/wait.h sys/stat.h fcntl.h stdarg.h pcreposix.h pcre/pcreposix.h fnmatch.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF fi @@ -4947,20 +4527,16 @@ done -{ echo "$as_me:$LINENO: * Checking for additonal information " >&5 -echo "$as_me: Checking for additonal information " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking for additonal information " >&5 +$as_echo "$as_me: Checking for additonal information " >&6;} save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -DSYSLOG_NAMES=1" -{ echo "$as_me:$LINENO: checking for facilitynames presence" >&5 -echo $ECHO_N "checking for facilitynames presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for facilitynames presence" >&5 +$as_echo_n "checking for facilitynames presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <stdio.h> @@ -4971,47 +4547,22 @@ { void attr=(void )facilitynames; ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ok=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ok=no + ok=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xyes; then -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CFLAGS="$save_CFLAGS -DHAVE_SYSLOG_H=1" else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <sys/stdio.h> @@ -5025,55 +4576,30 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ok=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ok=no + ok=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xyes; then -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } CFLAGS="$save_CFLAGS -DHAVE_SYS_SYSLOG_H=1" else -{ echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5 +$as_echo "missing" >&6; } CFLAGS="$save_CFLAGS -DHAVE_SYSLOG_H=1 -DMISS_FACILITYNAMES" fi fi -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <sys/types.h> #include <signal.h> @@ -5086,51 +4612,27 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_signal=int else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void + ac_cv_type_signal=void fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal _ACEOF -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / int @@ -5190,59 +4692,33 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF +$as_echo "#define const /*/" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if test "${ac_cv_type_uid_t+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <sys/types.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \| - $EGREP "uid_t" >/dev/null 2>&1; then + $EGREP "uid_t" >/dev/null 2>&1; then : ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no @@ -5250,76 +4726,20 @@ rm -f conftest fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF +$as_echo "#define uid_t int" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF +$as_echo "#define gid_t int" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -$ac_includes_default -typedef pid_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ ) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_type_pid_t=no -fi +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -5328,16 +4748,12 @@ fi -{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <sys/types.h> #include <sys/time.h> @@ -5345,487 +4761,181 @@ int main () -{ -if ((struct tm ) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_header_time=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for in_addr_t" >&5 -echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6; } -if test "${ac_cv_type_in_addr_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <sys/types.h> -#include <netinet/in.h> - -typedef in_addr_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ ) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_in_addr_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_type_in_addr_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5 -echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6; } -if test $ac_cv_type_in_addr_t = yes; then - : -else - CFLAGS="${CFLAGS} -DNEED_INADDRT" -fi - -{ echo "$as_me:$LINENO: checking for in_port_t" >&5 -echo $ECHO_N "checking for in_port_t... $ECHO_C" >&6; } -if test "${ac_cv_type_in_port_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <sys/types.h> -#include <netinet/in.h> - -typedef in_port_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ ) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_in_port_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_type_in_port_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_in_port_t" >&5 -echo "${ECHO_T}$ac_cv_type_in_port_t" >&6; } -if test $ac_cv_type_in_port_t = yes; then - : -else - CFLAGS="${CFLAGS} -DNEED_INPORTT" -fi - -{ echo "$as_me:$LINENO: checking for time_t" >&5 -echo $ECHO_N "checking for time_t... $ECHO_C" >&6; } -if test "${ac_cv_type_time_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <time.h> - -typedef time_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ ) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_time_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_type_time_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5 -echo "${ECHO_T}$ac_cv_type_time_t" >&6; } -if test $ac_cv_type_time_t = yes; then - : -else - CFLAGS="${CFLAGS} -DNEED_TIMET" -fi - - - -for ac_header in vfork.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) \| sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ +if ((struct tm ) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes else - eval "$as_ac_Header=\$ac_header_preproc" + ac_cv_header_time=no fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then -done +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +fi -for ac_func in fork vfork -do -as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if test "${ac_cv_type_long_long_int+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / -/ Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. / -#define $ac_func innocuous_$ac_func - -/ System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. / - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func -/ Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. / -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/ The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. / -#if defined __stub_$ac_func \|\| defined __stub___$ac_func -choke me -#endif + / For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. / + / Test literals. / + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + / Test constant expressions. / + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/ Test availability of runtime routines for shift and division. / + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) \| (ll >> 63) \| (ll < i) \| (ll > i) + \| (llmax / ll) \| (llmax % ll) + \| (ull << 63) \| (ull >> 63) \| (ull << i) \| (ull >> i) + \| (ullmax / ull) \| (ullmax % ull)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test "$cross_compiling" = yes; then : + ac_cv_type_long_long_int=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/ end confdefs.h. / +#include <limits.h> + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { -return $ac_func (); +long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_type_long_long_int=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 + ac_cv_type_long_long_int=no +fi +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +else + ac_cv_type_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +$as_echo "$ac_cv_type_long_long_int" >&6; } + if test $ac_cv_type_long_long_int = yes; then + +$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h + + fi + +ac_fn_c_check_type "$LINENO" "in_addr_t" "ac_cv_type_in_addr_t" "#include <sys/types.h> +#include <netinet/in.h> +" +if test "x$ac_cv_type_in_addr_t" = x""yes; then : + +else + CFLAGS="${CFLAGS} -DNEED_INADDRT" +fi + +ac_fn_c_check_type "$LINENO" "in_port_t" "ac_cv_type_in_port_t" "#include <sys/types.h> +#include <netinet/in.h> +" +if test "x$ac_cv_type_in_port_t" = x""yes; then : + +else + CFLAGS="${CFLAGS} -DNEED_INPORTT" +fi + +ac_fn_c_check_type "$LINENO" "time_t" "ac_cv_type_time_t" "#include <time.h> +" +if test "x$ac_cv_type_time_t" = x""yes; then : - eval "$as_ac_var=no" +else + CFLAGS="${CFLAGS} -DNEED_TIMET" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +for ac_header in vfork.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" +if test "x$ac_cv_header_vfork_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VFORK_H 1 +_ACEOF + fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + +done + +for ac_func in fork vfork +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" \| $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1 _ACEOF fi done if test "x$ac_cv_func_fork" = xyes; then - { echo "$as_me:$LINENO: checking for working fork" >&5 -echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +$as_echo_n "checking for working fork... " >&6; } +if test "${ac_cv_func_fork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_fork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / $ac_includes_default int @@ -5839,42 +4949,18 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_fork_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_fork_works=no + ac_cv_func_fork_works=no fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +$as_echo "$ac_cv_func_fork_works" >&6; } else ac_cv_func_fork_works=$ac_cv_func_fork @@ -5889,24 +4975,20 @@ ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - { echo "$as_me:$LINENO: checking for working vfork" >&5 -echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +$as_echo_n "checking for working vfork... " >&6; } +if test "${ac_cv_func_vfork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_vfork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Thanks to Paul Eggert for this test. / $ac_includes_default @@ -5998,319 +5080,50 @@ } } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_vfork_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_vfork_works=no + ac_cv_func_vfork_works=no fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +$as_echo "$ac_cv_func_vfork_works" >&6; } fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=$ac_cv_func_vfork - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} fi if test "x$ac_cv_func_vfork_works" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_VFORK 1 -_ACEOF +$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h else -cat >>confdefs.h <<\_ACEOF -#define vfork fork -_ACEOF +$as_echo "#define vfork fork" >>confdefs.h fi if test "x$ac_cv_func_fork_works" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_FORK 1 -_ACEOF - -fi - - -for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) \| sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1 -_ACEOF +$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -done - -{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 -echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_malloc_0_nonnull=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#if defined STDC_HEADERS \|\| defined HAVE_STDLIB_H -# include <stdlib.h> -#else -char malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_malloc_0_nonnull=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_malloc_0_nonnull=no -fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 -echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 1 -_ACEOF - -else - cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 0 -_ACEOF - - case " $LIBOBJS " in - " malloc.$ac_objext " ) ;; - ) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -cat >>confdefs.h <<\_ACEOF -#define malloc rpl_malloc -_ACEOF - -fi - - - -{ echo "$as_me:$LINENO: checking for working memcmp" >&5 -echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 +$as_echo_n "checking for working memcmp... " >&6; } +if test "${ac_cv_func_memcmp_working+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_memcmp_working=no else - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / $ac_includes_default int @@ -6345,42 +5158,18 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_memcmp_working=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_memcmp_working=no + ac_cv_func_memcmp_working=no fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 +$as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in " memcmp.$ac_objext " ) ;; ) LIBOBJS="$LIBOBJS memcmp.$ac_objext" @@ -6388,165 +5177,29 @@ esac - - for ac_header in sys/select.h sys/socket.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------- ## -## Report this to roseg@apsis.ch ## -## ----------------------------- ## -_ASBOX - ) \| sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking types of arguments for select" >&5 -echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6; } -if test "${ac_cv_func_select_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 +$as_echo_n "checking types of arguments for select... " >&6; } +if test "${ac_cv_func_select_args+set}" = set; then : + $as_echo_n "(cached) " >&6 else for ac_arg234 in 'fd_set ' 'int ' 'void '; do for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do for ac_arg5 in 'struct timeval ' 'const struct timeval '; do - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / $ac_includes_default #ifdef HAVE_SYS_SELECT_H @@ -6566,31 +5219,9 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done done @@ -6599,8 +5230,8 @@ : ${ac_cv_func_select_args='int,int ,struct timeval '} fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5 -echo "${ECHO_T}$ac_cv_func_select_args" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 +$as_echo "$ac_cv_func_select_args" >&6; } ac_save_IFS=$IFS; IFS=',' set dummy `echo "$ac_cv_func_select_args" \| sed 's/\/\/g'` IFS=$ac_save_IFS @@ -6622,16 +5253,12 @@ rm -f conftest* -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / #include <sys/types.h> #include <signal.h> @@ -6644,64 +5271,40 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_signal=int else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void + ac_cv_type_signal=void fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal _ACEOF -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_lstat_dereferences_slashed_symlink=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / $ac_includes_default int main () { struct stat sbuf; - / Linux will dereference the symlink and fail. + /* Linux will dereference the symlink and fail, as required by POSIX. That is better in the sense that it means we will not have to compile and use the lstat wrapper. / return lstat ("conftest.sym/", &sbuf) == 0; @@ -6709,39 +5312,15 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_lstat_dereferences_slashed_symlink=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no + ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - else # If the `ln -s' command failed, then we probably don't even # have an lstat function. @@ -6750,8 +5329,8 @@ rm -f conftest.sym conftest.file fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && @@ -6760,7 +5339,7 @@ _ACEOF -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then case " $LIBOBJS " in " lstat.$ac_objext " ) ;; ) LIBOBJS="$LIBOBJS lstat.$ac_objext" @@ -6769,19 +5348,15 @@ fi -{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 +$as_echo_n "checking whether stat accepts an empty string... " >&6; } +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_stat_empty_string_bug=yes else - cat >conftest.$ac_ext <<_ACEOF -/ confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / $ac_includes_default int @@ -6793,42 +5368,18 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_stat_empty_string_bug=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_func_stat_empty_string_bug=yes + ac_cv_func_stat_empty_string_bug=yes fi -rm -f core .core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 +$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } if test $ac_cv_func_stat_empty_string_bug = yes; then case " $LIBOBJS " in " stat.$ac_objext " ) ;; @@ -6843,111 +5394,24 @@ fi - for ac_func in strftime -do -as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -/ Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. / -#define $ac_func innocuous_$ac_func - -/ System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. / - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/ Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. / -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/ The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. / -#if defined __stub_$ac_func \|\| defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +if test "x$ac_cv_func_strftime" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" \| $as_tr_cpp` 1 +#define HAVE_STRFTIME 1 _ACEOF else # strftime is in -lintl on SCO UNIX. -{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_strftime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 +$as_echo_n "checking for strftime in -lintl... " >&6; } +if test "${ac_cv_lib_intl_strftime+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext / end confdefs.h. / / Override any GCC internal prototype to avoid an error. @@ -6965,154 +5429,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \" \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_strftime=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_strftime=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } -if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF - -LIBS="-lintl $LIBS" -fi - -fi -done - - - - - - - - - - - - - - - - - - -for ac_func in getaddrinfo inet_ntop memset regcomp poll socket strcasecmp strchr strdup strerror strncasecmp strspn strtol setsid X509_STORE_set_flags localtime_r gettimeofday -do -as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. / -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/ end confdefs.h. / -/ Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. / -#define $ac_func innocuous_$ac_func - -/ System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. / - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/ Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. / -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/ The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. / -#if defined __stub_$ac_func \|\| defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - \"* \| \` \| \\) ac_try_echo=\$ac_try;; - ) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ +' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" \|\| - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_strftime=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/\| /' conftest.$ac_ext >&5 + ac_cv_lib_intl_strftime=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 +$as_echo "$ac_cv_lib_intl_strftime" >&6; } +if test "x$ac_cv_lib_intl_strftime" = x""yes; then : + $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h - eval "$as_ac_var=no" +LIBS="-lintl $LIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +done + +for ac_func in getaddrinfo inet_ntop memset regcomp poll socket strcasecmp strchr strdup strerror strncasecmp strspn strtol setsid X509_STORE_set_flags localtime_r gettimeofday +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" \| $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1 _ACEOF fi @@ -7170,12 +5514,13 @@ case $ac_val in #( ${as_nl}) case $ac_var in #( - _cv_) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ \| IFS \| as_nl) ;; #( - ) $as_unset $ac_var ;; + BASH_ARGV \| BASH_SOURCE) eval $ac_var= ;; #( + ) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -7183,8 +5528,8 @@ (set) 2>&1 \| case $as_nl`(ac_space=' '; set) 2>&1` in #( ${as_nl}ac_space=\ ) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `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" @@ -7207,12 +5552,12 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -7228,11 +5573,11 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" \| sed "$ac_script"` + ac_i=`$as_echo "$ac_i" \| sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -7241,11 +5586,13 @@ : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF \|\| as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -7255,59 +5602,79 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF \|\| as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - posix) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + posix) : + set -o posix ;; #( + ) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + "$as_nl") + expr "X$arg" : "X\\(.\\)$as_nl"; + arg=`expr "X$arg" : ".$as_nl\\(.\\)"`;; + esac; + expr "X$arg" : "X\\(.\\)" \| tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) \|\| exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \|\| + PATH_SEPARATOR=';' + } fi @@ -7316,20 +5683,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( [\\/]* ) as_myself=$0 ;; ) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -7340,32 +5705,111 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi -done + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $ )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" \|\| test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.\(...\)'`" = X001; then as_expr=expr @@ -7379,13 +5823,17 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" \|\| $as_expr X/"$0" : './\([^/][^/]\)/$' \\| \ X"$0" : 'X\(//\)$' \\| \ X"$0" : 'X\(/\)' \\| . 2>/dev/null \|\| -echo X/"$0" \| +$as_echo X/"$0" \| sed '/^.\/\([^/][^/]\)\/$/{ s//\1/ q @@ -7400,104 +5848,103 @@ } s/././; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" \|\| { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself \| - sed ' - s/[$]LINENO./&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].\n\)\(.\)/\2\1\2/ - t loop - s/-\n.// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" \|\| - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n) - case `echo 'x\c'` in + case `echo 'xy\c'` in c) ECHO_T=' ';; # ECHO_T is single tab character. - ) ECHO_C='\c';; + xy) ECHO_C='\c';; + ) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; ) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -) as_dir=./$as_dir;; + esac + test -d "$as_dir" \|\| eval $as_mkdir_p \|\| { + as_dirs= + while :; do + case $as_dir in #( + \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'( + ) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" \|\| +$as_expr X"$as_dir" : 'X\(.[^/]\)//[^/][^/]/$' \\| \ + X"$as_dir" : 'X\(//\)[^/]' \\| \ + X"$as_dir" : 'X\(//\)$' \\| \ + X"$as_dir" : 'X\(/\)' \\| . 2>/dev/null \|\| +$as_echo X"$as_dir" \| + sed '/^X\(.[^/]\)\/\/[^/][^/]\/$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/]./{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\)./{ + s//\1/ + q + } + s/././; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" \|\| eval "mkdir $as_dirs" + } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -7514,12 +5961,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -)set "./$1";; + case $1 in #( + -)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]):;;)false;;esac;fi '\'' sh ' @@ -7534,13 +5981,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS \|\| ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pound $as_me 2.4.5, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by pound $as_me 2.6, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7553,29 +6006,41 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in " +") set x $ac_config_files; shift; ac_config_files=$;; +esac + +case $ac_config_headers in " +") set x $ac_config_headers; shift; ac_config_headers=$;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -7583,27 +6048,28 @@ Configuration headers: $config_headers -Report bugs to <bug-autoconf@gnu.org>." +Report bugs to <roseg@apsis.ch>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pound config.status 2.4.5 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +pound config.status 2.6 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +test -n "\$AWK" \|\| AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -7625,34 +6091,40 @@ -recheck \| --recheck \| --rechec \| --reche \| --rech \| --rec \| --re \| --r) ac_cs_recheck=: ;; --version \| --versio \| --versi \| --vers \| --ver \| --ve \| --v \| -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; + --config \| --confi \| --conf \| --con \| --co \| --c ) + $as_echo "$ac_cs_config"; exit ;; --debug \| --debu \| --deb \| --de \| --d \| -d ) debug=: ;; --file \| --fil \| --fi \| --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + \') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header \| --heade \| --head \| --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + \') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he \| --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help \| --hel \| -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q \| -quiet \| --quiet \| --quie \| --qui \| --qu \| --q \ \| -silent \| --silent \| --silen \| --sile \| --sil \| --si \| --s) ac_cs_silent=: ;; # This is an error. - -) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - ) ac_config_targets="$ac_config_targets $1" + ) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -7667,30 +6139,32 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -7699,9 +6173,7 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - ) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + ) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -7727,7 +6199,7 @@ trap 'exit_status=$? { test -z "$tmp" \|\| test ! -d "$tmp" \|\| rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -7738,143 +6210,139 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} \|\| -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} \|\| as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF +ac_cr=`echo X \| tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" \| sed 's/./&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh \|\| + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" \| grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -acx_pthread_config!$acx_pthread_config$ac_delim -PTHREAD_CC!$PTHREAD_CC$ac_delim -PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim -C_SSL!$C_SSL$ac_delim -C_T_RSA!$C_T_RSA$ac_delim -C_MAXBUF!$C_MAXBUF$ac_delim -C_OWNER!$C_OWNER$ac_delim -C_GROUP!$C_GROUP$ac_delim -C_SUPER!$C_SUPER$ac_delim -C_CERT1L!$C_CERT1L$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -I_OWNER!$I_OWNER$ac_delim -I_GRP!$I_GRP$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh \|\| + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.$ac_delim\$/X/p" conf$$subs.sed \| grep -c X` = 77; then + ac_delim_n=`sed -n "s/.$ac_delim\$/X/p" conf$$subs.awk \| grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" \| sort -nru \| sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@\|#_!!_#\|/g -s/^/s,@/; s/!/@,\|#_!!_#\|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.\n//; s/[,\\&]/\\&/g; s/@/@\|#_!!_#\|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -:end -s/\|#_!!_#\|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!./"]=/ +p +g +s/^[^!]!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)../\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)../\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' <conf$$subs.awk \| sed ' +/^[^""]/{ + N + s/\n// +} +' >>$CONFIG_STATUS \|\| ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + \|\| as_fn_error "could not setup config files machinery" "$LINENO" 5 +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -7891,20 +6359,128 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK \|\| +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum] +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]#[ ]define[ ][ ]/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()])\)[ ]\(.\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]\(.\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()])\)[ ]\(.\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]\(.\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h \| sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS \|\| ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]#[\t ](define\|undef)[\t ]+$ac_word_re([\t (]\|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/", prefix defundef, macro, "/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]:);; - :L \| :C:) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* \| :C:) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -7932,26 +6508,34 @@ [\\/$]) false;; ) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac \|\| - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # / config.h. Generated by config.status. / - configure_input="Generated from "`IFS=: - echo $ \| sed 's\|^[^:]/\|\|;s\|:[^:]/\|, \|g'`" by configure." + configure_input='Generated from '` + $as_echo "$" \| sed 's\|^[^:]/\|\|;s\|:[^:]/\|, \|g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + \&* \| \\| \| \\ ) + ac_sed_conf_input=`$as_echo "$configure_input" \| + sed 's/[\\\\&\|]/\\\\&/g'`;; #( + ) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - :-:* \| :-) cat >"$tmp/stdin";; + :-:* \| :-) cat >"$tmp/stdin" \ + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -7961,42 +6545,7 @@ X"$ac_file" : 'X\(//\)[^/]' \\| \ X"$ac_file" : 'X\(//\)$' \\| \ X"$ac_file" : 'X\(/\)' \\| . 2>/dev/null \|\| -echo X"$ac_file" \| - sed '/^X\(.[^/]\)\/\/[^/][^/]\/$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/]./{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\)./{ - s//\1/ - q - } - s/././; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -) as_dir=./$as_dir;; - esac - test -d "$as_dir" \|\| { $as_mkdir_p && mkdir -p "$as_dir"; } \|\| { - as_dirs= - while :; do - case $as_dir in #( - \') as_qdir=`echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #( - ) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" \|\| -$as_expr X"$as_dir" : 'X\(.[^/]\)//[^/][^/]/$' \\| \ - X"$as_dir" : 'X\(//\)[^/]' \\| \ - X"$as_dir" : 'X\(//\)$' \\| \ - X"$as_dir" : 'X\(/\)' \\| . 2>/dev/null \|\| -echo X"$as_dir" \| +$as_echo X"$ac_file" \| sed '/^X\(.[^/]\)\/\/[^/][^/]\/$/{ s//\1/ q @@ -8014,20 +6563,15 @@ q } s/././; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" \|\| eval "mkdir $as_dirs" - } \|\| test -d "$as_dir" \|\| { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ) - ac_dir_suffix=/`echo "$ac_dir" \| sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" \| sed 's\|^\.[\\/]\|\|'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" \| sed 's,/[^\\/],/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" \| sed 's\|/[^\\/]\|/..\|g;s\|/\|\|'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -8067,12 +6611,12 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -8080,36 +6624,37 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in datarootdir) ac_datarootdir_seen=yes;; @datadir@\|@docdir@\|@infodir@\|@localedir@\|@mandir@) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]@/!b -s&@configure_input@&$configure_input&;t t +s\|@configure_input@\|$ac_sed_conf_input\|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -8119,119 +6664,48 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs \| sed -f "$tmp/subs-1.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$tmp/subs.awk" >$tmp/out \ + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]datarootdir[ ]:=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - ) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + ) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum] -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]\\)[^ ]\\([ ]' -ac_dB='\\)[ (].,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h \| - sed -n ' - t rset - :rset - s/^[ ]#[ ]define[ ][ ]// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()])\)[ ]\(.\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]\(.\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]u.,/* & /,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]#[ ]undef[ ][ ]$ac_word_re[ ]\$/b def -/^[ ]#[ ]define[ ][ ]$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null \|\| break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input /" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/ $configure_input /" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - echo "/ $configure_input /" - cat "$ac_result" + $as_echo "/ $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + \|\| as_fn_error "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" ;; @@ -8240,11 +6714,13 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 \|\| + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -8264,6 +6740,10 @@ exec 5>>config.log # Use \|\|, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success \|\| { (exit 1); exit 1; } + $ac_cs_success \|\| as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi
[-] [+]	Changed	Pound-2.6.tgz/http.c ^
@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch / @@ -82,12 +81,12 @@ Read and write some binary data / static int -copy_bin(BIO const cl, BIO const be, long cont, long res_bytes, const int no_write) +copy_bin(BIO const cl, BIO const be, LONG cont, LONG res_bytes, const int no_write) { char buf[MAXBUF]; int res; - while(cont > 0L) { + while(cont > L0) { if((res = BIO_read(cl, buf, cont > MAXBUF? MAXBUF: cont)) < 0) return -1; else if(res == 0) @@ -110,7 +109,7 @@ The result buffer is NULL terminated * Return 0 on success / -static +static int get_line(BIO const in, char const buf, const int bufsize) { char tmp; @@ -126,7 +125,7 @@ case -1: return 1; default: - for(i = n_read; i < bufsize; i++) + for(i = n_read; i < bufsize && buf[i]; i++) if(buf[i] == '\n' \|\| buf[i] == '\r') { buf[i] = '\0'; return 0; @@ -149,7 +148,7 @@ / * Strip trailing CRLF / -static +static int strip_eol(char lin) { while(lin) @@ -165,12 +164,12 @@ Copy chunked / static int -copy_chunks(BIO const cl, BIO const be, long res_bytes, const int no_write, const long max_size) +copy_chunks(BIO const cl, BIO const be, LONG res_bytes, const int no_write, const LONG max_size) { char buf[MAXBUF]; - long cont, tot_size; + LONG cont, tot_size; regmatch_t matches[2]; - int has_eol, res; + int res; for(tot_size = 0L;;) { if((res = get_line(cl, buf, MAXBUF)) < 0) { @@ -180,7 +179,7 @@ / EOF / return 0; if(!regexec(&CHUNK_HEAD, buf, 2, matches, 0)) - cont = strtol(buf, NULL, 16); + cont = STRTOL(buf, NULL, 16); else { / not chunk header / logmsg(LOG_NOTICE, "(%lx) bad chunk header <%s>: %s", pthread_self(), buf, strerror(errno)); @@ -193,12 +192,12 @@ } tot_size += cont; - if(max_size > 0L && tot_size > max_size) { + if(max_size > L0 && tot_size > max_size) { logmsg(LOG_WARNING, "(%lx) chunk content too large", pthread_self); return -4; } - if(cont > 0L) { + if(cont > L0) { if(copy_bin(cl, be, cont, res_bytes, no_write)) { if(errno) logmsg(LOG_NOTICE, "(%lx) error copy chunk cont: %s", pthread_self(), strerror(errno)); @@ -454,15 +453,19 @@ #endif } -#define LOG_BYTES_SIZE 16 +#define LOG_BYTES_SIZE 32 / * Apache log-file-style number format / static void -log_bytes(char res, const long cnt) +log_bytes(char res, const LONG cnt) { - if(cnt > 0L) + if(cnt > L0) +#ifdef HAVE_LONG_LONG_INT + snprintf(res, LOG_BYTES_SIZE - 1, "%lld", cnt); +#else snprintf(res, LOG_BYTES_SIZE - 1, "%ld", cnt); +#endif else strcpy(res, "-"); return; @@ -481,10 +484,10 @@ / * handle an HTTP request / -void -thr_http(void arg) +void +do_http(thr_arg arg) { - int cl_11, be_11, res, chunked, n, sock, no_cont, skip, conn_closed, force_10, sock_proto; + int cl_11, be_11, res, chunked, n, sock, no_cont, skip, conn_closed, force_10, sock_proto, is_rpc; LISTENER lstn; SERVICE svc; BACKEND backend, cur_backend, old_backend; @@ -495,8 +498,8 @@ char request[MAXBUF], response[MAXBUF], buf[MAXBUF], url[MAXBUF], loc_path[MAXBUF], headers, headers_ok[MAXHEADERS], v_host[MAXBUF], referer[MAXBUF], u_agent[MAXBUF], u_name[MAXBUF], caddr[MAXBUF], req_time[LOG_TIME_SIZE], s_res_bytes[LOG_BYTES_SIZE], mh; - SSL ssl; - long cont, res_bytes; + SSL ssl, be_ssl; + LONG cont, res_bytes; regmatch_t matches[4]; struct linger l; double start_req, end_req; @@ -530,7 +533,7 @@ logmsg(LOG_WARNING, "(%lx) BIO_new_socket failed", pthread_self()); shutdown(sock, 2); close(sock); - pthread_exit(NULL); + return; } if(lstn->to > 0) { BIO_set_callback_arg(cl, (char )&lstn->to); @@ -538,18 +541,18 @@ } if(lstn->ctx != NULL) { - if((ssl = SSL_new(lstn->ctx)) == NULL) { + if((ssl = SSL_new(lstn->ctx->ctx)) == NULL) { logmsg(LOG_WARNING, "(%lx) SSL_new: failed", pthread_self()); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } SSL_set_bio(ssl, cl, cl); if((bb = BIO_new(BIO_f_ssl())) == NULL) { logmsg(LOG_WARNING, "(%lx) BIO_new(Bio_f_ssl()) failed", pthread_self()); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } BIO_set_ssl(bb, ssl, BIO_CLOSE); BIO_set_ssl_mode(bb, 0); @@ -563,7 +566,7 @@ / BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } else { if((x509 = SSL_get_peer_certificate(ssl)) != NULL && lstn->clnt_check < 3 && SSL_get_verify_result(ssl) != X509_V_OK) { @@ -571,7 +574,7 @@ logmsg(LOG_NOTICE, "Bad certificate from %s", caddr); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } } } else { @@ -583,14 +586,15 @@ logmsg(LOG_WARNING, "(%lx) BIO_new(buffer) failed", pthread_self()); BIO_reset(cl); BIO_free_all(cl); - pthread_exit(NULL); + return; } BIO_set_close(cl, BIO_CLOSE); BIO_set_buffer_size(cl, MAXBUF); cl = BIO_push(bb, cl); for(cl_11 = be_11 = 0;;) { - res_bytes = 0L; + res_bytes = L0; + is_rpc = -1; v_host[0] = referer[0] = u_agent[0] = u_name[0] = '\0'; conn_closed = 0; for(n = 0; n < MAXHEADERS; n++) @@ -604,7 +608,7 @@ } } clean_all(); - pthread_exit(NULL); + return; } memset(req_time, 0, LOG_TIME_SIZE); start_req = cur_time(); @@ -614,28 +618,40 @@ strncpy(request, headers[0], MAXBUF); if(!regexec(&lstn->verb, request, 3, matches, 0)) { no_cont = !strncasecmp(request + matches[1].rm_so, "HEAD", matches[1].rm_eo - matches[1].rm_so); + if(!strncasecmp(request + matches[1].rm_so, "RPC_IN_DATA", matches[1].rm_eo - matches[1].rm_so)) + is_rpc = 1; + else if(!strncasecmp(request + matches[1].rm_so, "RPC_OUT_DATA", matches[1].rm_eo - matches[1].rm_so)) + is_rpc = 0; } else { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_WARNING, "(%lx) e501 bad request \"%s\" from %s", pthread_self(), request, caddr); err_reply(cl, h501, lstn->err501); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } cl_11 = (request[strlen(request) - 1] == '1'); - strncpy(url, request + matches[2].rm_so, matches[2].rm_eo - matches[2].rm_so); - url[matches[2].rm_eo - matches[2].rm_so] = '\0'; + n = cpURL(url, request + matches[2].rm_so, matches[2].rm_eo - matches[2].rm_so); + if(n != strlen(url)) { + / the URL probably contained a %00 aka NULL - which we don't allow / + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e501 URL \"%s\" (contains NULL) from %s", pthread_self(), url, caddr); + err_reply(cl, h501, lstn->err501); + free_headers(headers); + clean_all(); + return; + } if(lstn->has_pat && regexec(&lstn->url_pat, url, 0, NULL, 0)) { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_NOTICE, "(%lx) e501 bad URL \"%s\" from %s", pthread_self(), url, caddr); err_reply(cl, h501, lstn->err501); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } / check other headers / - for(chunked = 0, cont = 0L, n = 1; n < MAXHEADERS && headers[n]; n++) { + for(chunked = 0, cont = L_1, n = 1; n < MAXHEADERS && headers[n]; n++) { / no overflow - see check_header for details / switch(check_header(headers[n], buf)) { case HEADER_HOST: @@ -652,7 +668,7 @@ conn_closed = 1; break; case HEADER_TRANSFER_ENCODING: - if(cont != 0L) + if(cont >= L0) headers_ok[n] = 0; else if(!strcasecmp("chunked", buf)) if(chunked) @@ -661,10 +677,11 @@ chunked = 1; break; case HEADER_CONTENT_LENGTH: - if(chunked) + if(chunked \|\| cont >= 0L) headers_ok[n] = 0; else - cont = atol(buf); + if((cont = ATOL(buf)) < 0L) + headers_ok[n] = 0; break; case HEADER_ILLEGAL: if(lstn->log_level > 0) { @@ -714,13 +731,13 @@ } / possibly limited request size / - if(lstn->max_req > 0L && cont > 0L && cont > lstn->max_req) { + if(lstn->max_req > L0 && cont > L0 && cont > lstn->max_req && is_rpc != 1) { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_NOTICE, "(%lx) e501 request too large (%ld) from %s", pthread_self(), cont, caddr); err_reply(cl, h501, lstn->err501); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } if(be != NULL) { @@ -735,19 +752,19 @@ / check that the requested URL still fits the old back-end (if any) / if((svc = get_service(lstn, url, &headers[1])) == NULL) { addr2str(caddr, MAXBUF - 1, &from_host, 1); - logmsg(LOG_NOTICE, "(%lx) e503 no service \"%s\" from %s", pthread_self(), request, caddr); + logmsg(LOG_NOTICE, "(%lx) e503 no service \"%s\" from %s %s", pthread_self(), request, caddr, v_host[0]? v_host: "-"); err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } if((backend = get_backend(svc, &from_host, url, &headers[1])) == NULL) { addr2str(caddr, MAXBUF - 1, &from_host, 1); - logmsg(LOG_NOTICE, "(%lx) e503 no back-end \"%s\" from %s", pthread_self(), request, caddr); + logmsg(LOG_NOTICE, "(%lx) e503 no back-end \"%s\" from %s %s", pthread_self(), request, caddr, v_host[0]? v_host: "-"); err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } if(be != NULL && backend != cur_backend) { @@ -771,8 +788,7 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); - break; + return; } if((sock = socket(sock_proto, SOCK_STREAM, 0)) < 0) { str_be(buf, MAXBUF - 1, backend); @@ -780,9 +796,9 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } - if(connect_nb(sock, &backend->addr, backend->to) < 0) { + if(connect_nb(sock, &backend->addr, backend->conn_to) < 0) { str_be(buf, MAXBUF - 1, backend); logmsg(LOG_WARNING, "(%lx) backend %s connect: %s", pthread_self(), buf, strerror(errno)); shutdown(sock, 2); @@ -804,7 +820,7 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } continue; } @@ -828,19 +844,48 @@ err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } BIO_set_close(be, BIO_CLOSE); if(backend->to > 0) { BIO_set_callback_arg(be, (char )&backend->to); BIO_set_callback(be, bio_callback); } + if(backend->ctx != NULL) { + if((be_ssl = SSL_new(backend->ctx)) == NULL) { + logmsg(LOG_WARNING, "(%lx) be SSL_new: failed", pthread_self()); + err_reply(cl, h503, lstn->err503); + free_headers(headers); + clean_all(); + return; + } + SSL_set_bio(be_ssl, be, be); + if((bb = BIO_new(BIO_f_ssl())) == NULL) { + logmsg(LOG_WARNING, "(%lx) BIO_new(Bio_f_ssl()) failed", pthread_self()); + err_reply(cl, h503, lstn->err503); + free_headers(headers); + clean_all(); + return; + } + BIO_set_ssl(bb, be_ssl, BIO_CLOSE); + BIO_set_ssl_mode(bb, 1); + be = bb; + if(BIO_do_handshake(be) <= 0) { + str_be(buf, MAXBUF - 1, backend); + logmsg(LOG_NOTICE, "BIO_do_handshake with %s failed: %s", buf, + ERR_error_string(ERR_get_error(), NULL)); + err_reply(cl, h503, lstn->err503); + free_headers(headers); + clean_all(); + return; + } + } if((bb = BIO_new(BIO_f_buffer())) == NULL) { logmsg(LOG_WARNING, "(%lx) e503 BIO_new(buffer) server failed", pthread_self()); err_reply(cl, h503, lstn->err503); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } BIO_set_buffer_size(bb, MAXBUF); BIO_set_close(bb, BIO_CLOSE); @@ -875,7 +920,7 @@ pthread_self(), strerror(errno)); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } if(BIO_printf(be, "%s\r\n", headers[n]) <= 0) { @@ -887,7 +932,7 @@ err_reply(cl, h500, lstn->err500); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } /* add header if required / @@ -895,12 +940,12 @@ if(BIO_printf(be, "%s\r\n", lstn->add_head) <= 0) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_WARNING, "(%lx) e500 error write HTTPSHeader to %s: %s (%.3f sec)", + logmsg(LOG_WARNING, "(%lx) e500 error write AddHeader to %s: %s (%.3f sec)", pthread_self(), buf, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } free_headers(headers); @@ -919,7 +964,7 @@ pthread_self(), buf, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } } @@ -934,7 +979,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } X509_NAME_print_ex(bb, X509_get_issuer_name(x509), 8, XN_FLAG_ONELINE & ~ASN1_STRFLGS_ESC_MSB); @@ -947,7 +992,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } ASN1_TIME_print(bb, X509_get_notBefore(x509)); @@ -960,7 +1005,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } ASN1_TIME_print(bb, X509_get_notAfter(x509)); @@ -973,7 +1018,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } if(BIO_printf(be, "X-SSL-serial: %ld\r\n", ASN1_INTEGER_get(X509_get_serialNumber(x509))) <= 0) { str_be(buf, MAXBUF - 1, cur_backend); @@ -983,7 +1028,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } #ifdef CERT1L PEM_write_bio_X509(bb, x509); @@ -996,7 +1041,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } while(get_line(bb, buf, MAXBUF) == 0) { if(BIO_printf(be, "%s", buf) <= 0) { @@ -1007,7 +1052,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } } if(BIO_printf(be, "\r\n", buf) <= 0) { @@ -1018,7 +1063,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } #else PEM_write_bio_X509(bb, x509); @@ -1031,7 +1076,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } while(get_line(bb, buf, MAXBUF) == 0) { if(BIO_printf(be, "\t%s\r\n", buf) <= 0) { @@ -1042,7 +1087,7 @@ err_reply(cl, h500, lstn->err500); BIO_free_all(bb); clean_all(); - pthread_exit(NULL); + return; } } #endif @@ -1063,22 +1108,88 @@ if(copy_chunks(cl, be, NULL, cur_backend->be_type, lstn->max_req)) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 copy_chunks to %s/%s (%.3f sec)", - pthread_self(), buf, request, (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s copy_chunks to %s/%s (%.3f sec)", + pthread_self(), caddr, buf, request, (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } - } else if(cont > 0L) { + } else if(cont > L0 && is_rpc != 1) { / had Content-length, so do raw reads/writes for the length / if(copy_bin(cl, be, cont, NULL, cur_backend->be_type)) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 error copy client cont to %s/%s: %s (%.3f sec)", - pthread_self(), buf, request, strerror(errno), (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s error copy client cont to %s/%s: %s (%.3f sec)", + pthread_self(), caddr, buf, request, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; + } + } else if(cont > 0L && is_readable(cl, lstn->to)) { + char one; + BIO cl_unbuf; + /* + * special mode for RPC_IN_DATA - content until EOF + * force HTTP/1.0 - client closes connection when done. + / + cl_11 = be_11 = 0; + + / + * first read whatever is already in the input buffer + / + while(BIO_pending(cl)) { + if(BIO_read(cl, &one, 1) != 1) { + logmsg(LOG_NOTICE, "(%lx) error read request pending: %s", + pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } + if (++res_bytes > cont) { + logmsg(LOG_NOTICE, "(%lx) error read request pending: max. RPC length exceeded", + pthread_self()); + clean_all(); + pthread_exit(NULL); + } + if(BIO_write(be, &one, 1) != 1) { + if(errno) + logmsg(LOG_NOTICE, "(%lx) error write request pending: %s", + pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } + } + BIO_flush(be); + + / + * find the socket BIO in the chain + / + if ((cl_unbuf = BIO_find_type(cl, lstn->ctx? BIO_TYPE_SSL : BIO_TYPE_SOCKET)) == NULL) { + logmsg(LOG_WARNING, "(%lx) error get unbuffered: %s", pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } + + / + * copy till EOF + / + while((res = BIO_read(cl_unbuf, buf, MAXBUF)) > 0) { + if((res_bytes += res) > cont) { + logmsg(LOG_NOTICE, "(%lx) error copy request body: max. RPC length exceeded", + pthread_self()); + clean_all(); + pthread_exit(NULL); + } + if(BIO_write(be, buf, res) != res) { + if(errno) + logmsg(LOG_NOTICE, "(%lx) error copy request body: %s", + pthread_self(), strerror(errno)); + clean_all(); + pthread_exit(NULL); + } else { + BIO_flush(be); + } } } @@ -1086,11 +1197,12 @@ if(cur_backend->be_type == 0 && BIO_flush(be) != 1) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 error flush to %s/%s: %s (%.3f sec)", - pthread_self(), buf, request, strerror(errno), (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s error flush to %s/%s: %s (%.3f sec)", + pthread_self(), caddr, buf, request, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } / @@ -1114,7 +1226,7 @@ /* if we have a redirector / if(cur_backend->be_type) { memset(buf, 0, sizeof(buf)); - if(cur_backend->redir_req) + if(!cur_backend->redir_req) snprintf(buf, sizeof(buf) - 1, "%s%s", cur_backend->url, url); else strncpy(buf, cur_backend->url, sizeof(buf) - 1); @@ -1144,6 +1256,51 @@ if(!cl_11 \|\| conn_closed \|\| force_10) break; continue; + } else if(is_rpc == 1) { + / log RPC_IN_DATA / + end_req = cur_time(); + memset(s_res_bytes, 0, LOG_BYTES_SIZE); + / actual request length / + log_bytes(s_res_bytes, res_bytes); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + str_be(buf, MAXBUF - 1, cur_backend); + switch(lstn->log_level) { + case 0: + break; + case 1: + logmsg(LOG_INFO, "%s %s - -", caddr, request); + break; + case 2: + if(v_host[0]) + logmsg(LOG_INFO, "%s %s - - (%s/%s -> %s) %.3f sec", + caddr, request, v_host, svc->name[0]? svc->name: "-", buf, + (end_req - start_req) / 1000000.0); + else + logmsg(LOG_INFO, "%s %s - - (%s -> %s) %.3f sec", + caddr, request, svc->name[0]? svc->name: "-", buf, + (end_req - start_req) / 1000000.0); + break; + case 3: + logmsg(LOG_INFO, "%s %s - %s [%s] \"%s\" 000 %s \"%s\" \"%s\"", + v_host[0]? v_host: "-", + caddr, u_name[0]? u_name: "-", req_time, request, + s_res_bytes, referer, u_agent); + break; + case 4: + logmsg(LOG_INFO, "%s - %s [%s] \"%s\" 000 %s \"%s\" \"%s\"", + caddr, u_name[0]? u_name: "-", req_time, request, + s_res_bytes, referer, u_agent); + break; + case 5: + logmsg(LOG_INFO, "%s %s - %s [%s] \"%s\" 000 %s \"%s\" \"%s\" (%s -> %s) %.3f sec", + v_host[0]? v_host: "-", + caddr, u_name[0]? u_name: "-", req_time, request, + s_res_bytes, referer, u_agent, svc->name[0]? svc->name: "-", buf, + (end_req - start_req) / 1000000.0); + break; + } + / no response expected - bail out / + break; } / get the response / @@ -1151,11 +1308,12 @@ if((headers = get_headers(be, cl, lstn)) == NULL) { str_be(buf, MAXBUF - 1, cur_backend); end_req = cur_time(); - logmsg(LOG_NOTICE, "(%lx) e500 response error read from %s/%s: %s (%.3f secs)", - pthread_self(), buf, request, strerror(errno), (end_req - start_req) / 1000000.0); + addr2str(caddr, MAXBUF - 1, &from_host, 1); + logmsg(LOG_NOTICE, "(%lx) e500 for %s response error read from %s/%s: %s (%.3f secs)", + pthread_self(), caddr, buf, request, strerror(errno), (end_req - start_req) / 1000000.0); err_reply(cl, h500, lstn->err500); clean_all(); - pthread_exit(NULL); + return; } strncpy(response, headers[0], MAXBUF); @@ -1179,10 +1337,13 @@ } break; case HEADER_CONTENT_LENGTH: - cont = atol(buf); + cont = ATOL(buf); + / treat RPC_OUT_DATA like reply without content-length / + if(is_rpc == 0 && cont == 0x40000000L) + cont = -1L; break; case HEADER_LOCATION: - if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, lstn, cur_backend)) { + if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, v_host, lstn, cur_backend)) { snprintf(buf, MAXBUF, "Location: %s://%s/%s", (ssl == NULL? "http": "https"), v_host, loc_path); free(headers[n]); @@ -1191,12 +1352,12 @@ pthread_self(), strerror(errno)); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } break; case HEADER_CONTLOCATION: - if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, lstn, cur_backend)) { + if(v_host[0] && need_rewrite(lstn->rewr_loc, buf, loc_path, v_host, lstn, cur_backend)) { snprintf(buf, MAXBUF, "Content-location: %s://%s/%s", (ssl == NULL? "http": "https"), v_host, loc_path); free(headers[n]); @@ -1205,7 +1366,7 @@ pthread_self(), strerror(errno)); free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } break; @@ -1225,7 +1386,7 @@ } free_headers(headers); clean_all(); - pthread_exit(NULL); + return; } } free_headers(headers); @@ -1239,25 +1400,25 @@ logmsg(LOG_NOTICE, "(%lx) error flush headers to %s: %s", pthread_self(), caddr, strerror(errno)); } clean_all(); - pthread_exit(NULL); + return; } if(!no_cont) { / ignore this if request was HEAD or similar / if(be_11 && chunked) { / had Transfer-encoding: chunked so read/write all the chunks (HTTP/1.1 only) / - if(copy_chunks(be, cl, &res_bytes, skip, 0L)) { + if(copy_chunks(be, cl, &res_bytes, skip, L0)) { / copy_chunks() has its own error messages / clean_all(); - pthread_exit(NULL); + return; } - } else if(cont >= 0L) { + } else if(cont >= L0) { / may have had Content-length, so do raw reads/writes for the length / if(copy_bin(be, cl, cont, &res_bytes, skip)) { if(errno) logmsg(LOG_NOTICE, "(%lx) error copy server cont: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } } else if(!skip) { if(is_readable(be, cur_backend->to)) { @@ -1277,14 +1438,14 @@ logmsg(LOG_NOTICE, "(%lx) error read response pending: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } if(BIO_write(cl, &one, 1) != 1) { if(errno) logmsg(LOG_NOTICE, "(%lx) error write response pending: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } res_bytes++; } @@ -1293,10 +1454,10 @@ / * find the socket BIO in the chain / - if((be_unbuf = BIO_find_type(be, BIO_TYPE_SOCKET)) == NULL) { + if((be_unbuf = BIO_find_type(be, cur_backend->ctx? BIO_TYPE_SSL : BIO_TYPE_SOCKET)) == NULL) { logmsg(LOG_WARNING, "(%lx) error get unbuffered: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } / @@ -1308,7 +1469,7 @@ logmsg(LOG_NOTICE, "(%lx) error copy response body: %s", pthread_self(), strerror(errno)); clean_all(); - pthread_exit(NULL); + return; } else { res_bytes += res; BIO_flush(cl); @@ -1317,12 +1478,15 @@ } } if(BIO_flush(cl) != 1) { + /* client closes RPC_OUT_DATA connection - no error / + if(is_rpc == 0 && res_bytes > 0L) + break; if(errno) { addr2str(caddr, MAXBUF - 1, &from_host, 1); logmsg(LOG_NOTICE, "(%lx) error final flush to %s: %s", pthread_self(), caddr, strerror(errno)); } clean_all(); - pthread_exit(NULL); + return; } } } @@ -1394,5 +1558,17 @@ SSL_set_shutdown(ssl, SSL_SENT_SHUTDOWN \| SSL_RECEIVED_SHUTDOWN); clean_all(); - pthread_exit(NULL); + return; +} + +void +thr_http(void dummy) +{ + thr_arg arg; + + for(;;) { + while((arg = get_thr_arg()) == NULL) + logmsg(LOG_WARNING, "NULL get_thr_arg"); + do_http(arg); + } }
[-] [+]	Changed	Pound-2.6.tgz/pound.8 ^
@@ -1,4 +1,4 @@ -.TH POUND "8" "May 2002" "pound" "System Manager's Manual" +.TH POUND "8" "Jan 2010" "pound" "System Manager's Manual" .SH NAME pound \- HTTP/HTTPS reverse-proxy and load-balancer .SH SYNOPSIS @@ -222,6 +222,16 @@ to work like a regular process. Useful for debugging or if you want to use something like \fIdaemontools\fR. .TP +\fBThreads\fR nnn +How many worker threads +.B Pound +should use. Default: 128. Tune this parameter to improve performance. +If you set it too high, +.B Pound +will use a lot memory, and some CPU will be wasted on context switches. +If you set it too low requests may be served with some delay. Experiment +to find the optimal value for your installation. +.TP \fBLogFacility\fR value Specify the log facility to use. .I value @@ -243,6 +253,10 @@ used). This value can be overridden for specific listeners. .TP +\fBIgnoreCase\fR 0\|1 +Ignore case when matching URLs (default: 0). This value can be +overridden for specific services. +.TP \fBDynScale\fR 0\|1 Enable or disable the dynamic rescaling code (default: 0). If enabled .B Pound @@ -275,6 +289,13 @@ wait for a response from the back-end (in seconds). Default: 15 seconds. This value can be overridden for specific back-ends. .TP +\fBConnTO\fR value +How long should +.B Pound +wait for a connection to the back-end (in seconds). Default: the +.B TimeOut +value. This value can be overridden for specific back-ends. +.TP \fBGrace\fR value How long should .B Pound @@ -296,6 +317,9 @@ the .I poundctl(8) program. +.TP +\fBInclude\fR "/path/to/file" +Include the file as though it were part of the configuration file. .SH "HTTP Listener" An HTTP listener defines an address and port that .B Pound @@ -394,7 +418,8 @@ .TP \fBAddHeader\fR "header: to add" Add the defined header to the request passed to the back-end server. The header -is added verbatim. +is added verbatim. Use multiple \fIAddHeader\fR directives if you need to add more +than one header. .TP \fBRewriteLocation\fR 0\|1\|2 If 1 force @@ -443,12 +468,31 @@ for this server. This directive is .B mandatory for HTTPS listeners. +.IP +Please note that multiple +.I Cert +directives are allowed if your OpenSSL version supports SNI. In such cases, +the first directive is the default certificate, with additional certificates +used if the client requests them. +.IP +The ordering of the directives is important: the first certificate where the CN +matches the client request will be used, so put your directives in the +most-specific-to-least specific order (i.e. wildcard certificates +.B after +host-specific certificates). +.IP +.I Cert +directives +.B must +precede all other SSL-specific directives. .TP \fBClientCert\fR 0\|1\|2\|3 depth Ask for the client's HTTPS certificate: 0 - don't ask (default), 1 - ask, 2 - ask and fail if no certificate was presented, 3 - ask but do not verify. -.I depth -is the depth of verification for a client certificate (up to 9). +.I Depth +is the depth of verification for a client certificate (up to 9). The default +depth limit is 9, allowing for the peer certificate and additional 9 CA +certificates that must be verified. .TP \fBCiphers\fR "acceptable:cipher:list" This is the list of ciphers that will be accepted by the SSL connection; it is a @@ -506,7 +550,14 @@ .I URL conditions per service. If no .I URL -was defined then all requests match. +was defined then all requests match. The matching is by default case-sensitive, +but this can be overridden by specifying +.B IgnoreCase 1 +.TP +\fBIgnoreCase\fR 0\|1 +Override the global +.B IgnoreCase +setting. .TP \fBHeadRequire\fR "pattern" The request must contain at least on header matching the given pattern. @@ -533,6 +584,14 @@ Enable or disable dynamic rescaling for the current service. This value will override the value globally defined. .TP +\fBDisabled\fR 0\|1 +Start +.B Pound +with this service disabled (1) or enabled (0). If started as disabled, the +service can be later enabled with +.I poundctl +(8). +.TP \fBBackEnd\fR Directives enclosed between a .I BackEnd @@ -636,6 +695,13 @@ .B mandatory parameter for non Unix-domain back-ends. .TP +\fBHTTPS\fR [ "cert" ] +The back-end is using HTTPS. If the optional parameter +.I cert +is specified, +.B Pound +will present this certificate to the back-end. +.TP \fBPriority\fR val The priority of this back-end (between 1 and 9, 5 is default). Higher priority back-ends will be used more often than lower priority ones, so you should @@ -646,12 +712,25 @@ .I TimeOut value. .TP +\fBConnTO\fR val +Override the global +.I ConnTO +value. +.TP \fBHAport\fR [ address ] port A port (and optional address) to be used for server function checks. See below the "High Availability" section for a more detailed discussion. By default .B Pound uses the same address as the back-end server, but you may use a separate address if you wish. This directive applies only to non Unix-domain servers. +.TP +\fBDisabled\fR 0\|1 +Start +.B Pound +with this back-end disabled (1) or enabled (0). If started as disabled, the +back-end can be later enabled with +.I poundctl +(8). .SH "Emergency" The emergency server will be used once all existing back-ends are "dead". All configuration directives enclosed between @@ -1129,7 +1208,7 @@ .SH "REPORTING BUGS" Report bugs to <roseg@apsis.ch>. .SH COPYRIGHT -Copyright \(co 2002-2006 Apsis GmbH. +Copyright \(co 2002-2010 Apsis GmbH. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[-] [+]	Changed	Pound-2.6.tgz/pound.c ^
@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch / @@ -106,6 +105,68 @@ } / + * work queue stuff + / +static thr_arg first = NULL, last = NULL; +static pthread_cond_t arg_cond; +static pthread_mutex_t arg_mut; +int numthreads; + +static void +init_thr_arg(void) +{ + pthread_cond_init(&arg_cond, NULL); + pthread_mutex_init(&arg_mut, NULL); + return; +} + +/ + * add a request to the queue + / +int +put_thr_arg(thr_arg arg) +{ + thr_arg res; + + if((res = malloc(sizeof(thr_arg))) == NULL) { + logmsg(LOG_WARNING, "thr_arg malloc"); + return -1; + } + memcpy(res, arg, sizeof(thr_arg)); + res->next = NULL; + (void)pthread_mutex_lock(&arg_mut); + if(last == NULL) + first = last = res; + else { + last->next = res; + last = last->next; + } + (void)pthread_mutex_unlock(&arg_mut); + pthread_cond_signal(&arg_cond); + return 0; +} + +/ + * get a request from the queue + / +thr_arg +get_thr_arg(void) +{ + thr_arg res; + + (void)pthread_mutex_lock(&arg_mut); + if(first == NULL) + (void)pthread_cond_wait(&arg_cond, &arg_mut); + if((res = first) != NULL) + if((first = first->next) == NULL) + last = NULL; + (void)pthread_mutex_unlock(&arg_mut); + if(first != NULL) + pthread_cond_signal(&arg_cond); + return res; +} + +/ * handle SIGTERM/SIGQUIT - exit / static RETSIGTYPE @@ -185,6 +246,7 @@ SSL_library_init(); OpenSSL_add_all_algorithms(); l_init(); + init_thr_arg(); CRYPTO_set_id_callback(l_id); CRYPTO_set_locking_callback(l_lock); init_timer(); @@ -195,7 +257,7 @@ \|\| regcomp(&RESP_SKIP, "^HTTP/1.1 100.$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&RESP_IGN, "^HTTP/1.[01] (10[1-9]\|1[1-9][0-9]\|204\|30[456]).$", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) \|\| regcomp(&LOCATION, "(http\|https)://([^/]+)(.)", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) - \|\| regcomp(&AUTHORIZATION, "Authorization:[ \t]Basic[ \t]([^ \t])[ \t]", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) + \|\| regcomp(&AUTHORIZATION, "Authorization:[ \t]Basic[ \t]\"?([^ \t])\"?[ \t]", REG_ICASE \| REG_NEWLINE \| REG_EXTENDED) ) { logmsg(LOG_ERR, "bad essential Regex - aborted"); exit(1); @@ -377,7 +439,17 @@ } /* pause to make sure the service threads were started / - sleep(2); + sleep(1); + + / create the worker threads / + for(i = 0; i < numthreads; i++) + if(pthread_create(&thr, &attr, thr_http, NULL)) { + logmsg(LOG_ERR, "create thr_http: %s - aborted", strerror(errno)); + exit(1); + } + + / pause to make sure at least some of the worker threads were started / + sleep(1); / and start working / for(;;) { @@ -409,7 +481,7 @@ logmsg(LOG_WARNING, "HTTP accept: %s", strerror(errno)); } else if(((struct sockaddr_in )&clnt_addr)->sin_family == AF_INET \|\| ((struct sockaddr_in )&clnt_addr)->sin_family == AF_INET6) { - thr_arg arg; + thr_arg arg; if(lstn->disabled) { /* @@ -418,30 +490,21 @@ / close(clnt); } - if((arg = (thr_arg )malloc(sizeof(thr_arg))) == NULL) { - logmsg(LOG_WARNING, "HTTP arg: malloc"); - close(clnt); - continue; - } - arg->sock = clnt; - arg->lstn = lstn; - if((arg->from_host.ai_addr = (struct sockaddr )malloc(clnt_length)) == NULL) { + arg.sock = clnt; + arg.lstn = lstn; + if((arg.from_host.ai_addr = (struct sockaddr )malloc(clnt_length)) == NULL) { logmsg(LOG_WARNING, "HTTP arg address: malloc"); - free(arg); + close(clnt); continue; } - memcpy(arg->from_host.ai_addr, &clnt_addr, clnt_length); - arg->from_host.ai_addrlen = clnt_length; + memcpy(arg.from_host.ai_addr, &clnt_addr, clnt_length); + arg.from_host.ai_addrlen = clnt_length; if(((struct sockaddr_in )&clnt_addr)->sin_family == AF_INET) - arg->from_host.ai_family = AF_INET; + arg.from_host.ai_family = AF_INET; else - arg->from_host.ai_family = AF_INET6; - if(pthread_create(&thr, &attr, thr_http, (void )arg)) { - logmsg(LOG_WARNING, "HTTP pthread_create: %s", strerror(errno)); - free(arg->from_host.ai_addr); - free(arg); + arg.from_host.ai_family = AF_INET6; + if(put_thr_arg(&arg)) close(clnt); - } } else { /* may happen on FreeBSD, I am told */ logmsg(LOG_WARNING, "HTTP connection prematurely closed by peer");
[-] [+]	Changed	Pound-2.6.tgz/pound.h ^
@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,7 +22,6 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch / @@ -180,10 +179,14 @@ #error "Pound needs signal.h" #endif +#if HAVE_LIBPCREPOSIX #if HAVE_PCREPOSIX_H #include <pcreposix.h> -#elif HAVE_PCRE_PCREPOSIX +#elif HAVE_PCRE_PCREPOSIX_H #include <pcre/pcreposix.h> +#else +#error "You have libpcreposix, but the header files are missing. Use --disable-pcreposix" +#endif #elif HAVE_REGEX_H #include <regex.h> #else @@ -228,10 +231,30 @@ #include <varargs.h> #endif +#if HAVE_FNMATCH_H +#include <fnmatch.h> +#else +#error "Pound needs fnmatch.h" +#endif + #ifndef __STDC__ #define const #endif +#ifdef HAVE_LONG_LONG_INT +#define LONG long long +#define L0 0LL +#define L_1 -1LL +#define STRTOL strtoll +#define ATOL atoll +#else +#define LONG long +#define L0 0L +#define L_1 -1L +#define STRTOL strtol +#define ATOL atol +#endif + #ifndef NO_EXTERNALS / * Global variables needed by everybody @@ -243,7 +266,8 @@ pid_name, / file to record pid in / ctrl_name; /* control socket name / -extern int alive_to, / check interval for resurrection / +extern int numthreads, / number of worker threads / + alive_to, / check interval for resurrection / daemonize, / run as daemon / log_facility, / log facility to use / print_log, / print log messages to stdout/stderr / @@ -292,10 +316,12 @@ int be_type; / 0 if real back-end, otherwise code (301, 302/default, 307) / struct addrinfo addr; / IPv4/6 address / int priority; / priority / - int to; + int to; / read/write time-out / + int conn_to; / connection time-out / struct addrinfo ha_addr; / HA address/port / char url; /* for redirectors / int redir_req; / the redirect should include the request path / + SSL_CTX ctx; /* CTX for SSL connections / pthread_mutex_t mut; / mutex for this back-end / int n_requests; / number of requests seen / double t_requests; / time to answer these requests / @@ -317,6 +343,10 @@ / maximal session key size / #define KEY_SIZE 127 +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +DECLARE_LHASH_OF(TABNODE); +#endif + / service definition / typedef struct _service { char name[KEY_SIZE + 1]; / symbolic name / @@ -330,9 +360,13 @@ pthread_mutex_t mut; / mutex for this service / SESS_TYPE sess_type; int sess_ttl; / session time-to-live / + regex_t sess_start; / pattern to identify the session data / regex_t sess_pat; / pattern to match the session data / - char sess_parm; /* session cookie or parameter / +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHASH_OF(TABNODE) sessions; /* currently active sessions / +#else LHASH sessions; /* currently active sessions / +#endif int dynscale; / true if the back-ends should be dynamically rescaled / int disabled; / true if the service is disabled / struct _service next; @@ -342,28 +376,34 @@ extern SERVICE services; / global services (if any) / #endif / NO_EXTERNALS / +typedef struct _pound_ctx { + SSL_CTX ctx; + char server_name; + struct _pound_ctx next; +} POUND_CTX; + /* Listener definition / typedef struct _listener { - struct addrinfo addr; / IPv4/6 address / - int sock; / listening socket / - SSL_CTX ctx; /* CTX for SSL connections / - int clnt_check; / client verification mode / - int noHTTPS11; / HTTP 1.1 mode for SSL / - char add_head; /* extra SSL header / - regex_t verb; / pattern to match the request verb against / - int to; / client time-out / - int has_pat; / was a URL pattern defined? / - regex_t url_pat; / pattern to match the request URL against / - char err414, /* error messages / + struct addrinfo addr; / IPv4/6 address / + int sock; / listening socket / + POUND_CTX ctx; /* CTX for SSL connections / + int clnt_check; / client verification mode / + int noHTTPS11; / HTTP 1.1 mode for SSL / + char add_head; /* extra SSL header / + regex_t verb; / pattern to match the request verb against / + int to; / client time-out / + int has_pat; / was a URL pattern defined? / + regex_t url_pat; / pattern to match the request URL against / + char err414, /* error messages / err500, err501, err503; - long max_req; /* max. request size / - MATCHER head_off; /* headers to remove / - int rewr_loc; / rewrite location response / - int rewr_dest; / rewrite destination header / - int disabled; / true if the listener is disabled / - int log_level; / log level for this listener / + LONG max_req; / max. request size / + MATCHER head_off; /* headers to remove / + int rewr_loc; / rewrite location response / + int rewr_dest; / rewrite destination header / + int disabled; / true if the listener is disabled / + int log_level; / log level for this listener / SERVICE services; struct _listener next; } LISTENER; @@ -372,10 +412,11 @@ extern LISTENER listeners; /* all available listeners / #endif / NO_EXTERNALS / -typedef struct { +typedef struct _thr_arg { int sock; LISTENER lstn; struct addrinfo from_host; + struct _thr_arg next; } thr_arg; / argument to processing threads: socket, origin / / Header types / @@ -425,6 +466,16 @@ #endif / + * add a request to the queue + / +extern int put_thr_arg(thr_arg ); + +/* + * get a request from the queue + / +extern thr_arg get_thr_arg(void); + +/* * handle an HTTP request / extern void thr_http(void ); @@ -435,6 +486,11 @@ extern void logmsg(const int, const char , ...); /* + * Parse a URL, possibly decoding hexadecimal-encoded characters + / +extern int cpURL(char , char , int); + +/ * Translate inet/inet6 address into a string / extern void addr2str(char , const int, const struct addrinfo , const int); @@ -465,7 +521,7 @@ (1) if the redirect was done to the correct location with the wrong protocol * (2) if the redirect was done to the back-end rather than the listener / -extern int need_rewrite(const int, char const, char const, const LISTENER , const BACKEND ); +extern int need_rewrite(const int, char const, char const, const char , const LISTENER , const BACKEND ); /* * (for cookies only) possibly create session based on response headers / @@ -530,6 +586,11 @@ extern RSA RSA_tmp_callback(SSL , int, int); / + * return a pre-generated RSA key + / +extern DH DH_tmp_callback(SSL , int, int); + +/ * expiration stuff */ #ifndef EXPIRE_TO
[-] [+]	Changed	Pound-2.6.tgz/poundctl.8 ^
@@ -1,9 +1,9 @@ -.TH POUNDCTL "8" "October 2006" "poundctl" "System Manager's Manual" +.TH POUNDCTL "8" "Jan 2010" "poundctl" "System Manager's Manual" .SH NAME poundctl \- control the pound(8) daemon .SH SYNOPSIS .TP -.B poundctl \fI-c /path/to/socket\fR [\fI-L/-l\fR] [\fI-S/-s\fR] [\fI-B/-b\fR] [\fI-N/-n\fR] +.B poundctl \fI-c /path/to/socket\fR [\fI-L/-l\fR] [\fI-S/-s\fR] [\fI-B/-b\fR] [\fI-N/-n\fR] [\fI-H\fR] [\fI-X\fR] .SH DESCRIPTION .PP .B Poundctl @@ -48,6 +48,13 @@ The parameters n, m and r refer to the number assigned to a particular listener, service and back-end in the listings. A listener number of -1 refers by convention to the global context. +.TP +\fB\-H\fR +Try to resolve the addresses to symbolic names. Depending on your configuration, +this may require an active DNS. +.TP +\fB\-X\fR +Show the results in XML format. .PP When called without flags .B poundctl @@ -59,7 +66,7 @@ .SH "REPORTING BUGS" Report bugs to <roseg@apsis.ch>. .SH COPYRIGHT -Copyright \(co 2002-2006 Apsis GmbH. +Copyright \(co 2002-2010 Apsis GmbH. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[-] [+]	Changed	Pound-2.6.tgz/poundctl.c ^
@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,13 +22,13 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch / #define NO_EXTERNALS 1 #include "pound.h" static int xml_out = 0; +static int host_names = 0; static void usage(const char arg0) @@ -45,7 +45,8 @@ fprintf(stderr, "\t-n n m k - remove a session with key k r in service m in listener n\n"); fprintf(stderr, "\n"); fprintf(stderr, "\tentering the command without arguments lists the current configuration.\n"); - fprintf(stderr, "\tthe -X flags results in XML output.\n"); + fprintf(stderr, "\tthe -X flag results in XML output.\n"); + fprintf(stderr, "\tthe -H flag shows symbolic host names instead of addresses.\n"); exit(1); } @@ -66,12 +67,16 @@ case AF_INET: src = (void )&((struct sockaddr_in )addr->ai_addr)->sin_addr.s_addr; port = ntohs(((struct sockaddr_in )addr->ai_addr)->sin_port); + if(host_names && !getnameinfo(addr->ai_addr, addr->ai_addrlen, buf, UNIX_PATH_MAX - 1, NULL, 0, 0)) + break; if(inet_ntop(AF_INET, src, buf, UNIX_PATH_MAX - 1) == NULL) strncpy(buf, "(UNKNOWN)", UNIX_PATH_MAX - 1); break; case AF_INET6: src = (void )&((struct sockaddr_in6 )addr->ai_addr)->sin6_addr.s6_addr; port = ntohs(((struct sockaddr_in6 )addr->ai_addr)->sin6_port); + if(host_names && !getnameinfo(addr->ai_addr, addr->ai_addrlen, buf, UNIX_PATH_MAX - 1, NULL, 0, 0)) + break; if(inet_ntop(AF_INET6, src, buf, UNIX_PATH_MAX - 1) == NULL) strncpy(buf, "(UNKNOWN)", UNIX_PATH_MAX - 1); break; @@ -109,9 +114,10 @@ be.ha_addr.ai_addr = (struct sockaddr )&h; } if(xml_out) - printf("<backend index=\"%d\" address=\"%s\" average=\"%.3f\" priority=\"%d\"%s%s />\n", n_be++, - prt_addr(&be.addr), be.t_average / 1000000, be.priority, be.alive? "": " DEAD", - be.disabled? " DISABLED": ""); + printf("<backend index=\"%d\" address=\"%s\" avg=\"%.3f\" priority=\"%d\" alive=\"%s\" status=\"%s\" />\n", + n_be++, + prt_addr(&be.addr), be.t_average / 1000000, be.priority, be.alive? "yes": "DEAD", + be.disabled? "DISABLED": "active"); else printf(" %3d. Backend %s %s (%d %.3f sec) %s\n", n_be++, prt_addr(&be.addr), be.disabled? "DISABLED": "active", be.priority, be.t_average / 1000000, be.alive? "alive": "DEAD"); @@ -165,7 +171,8 @@ break; if(xml_out) { if(svc.name[0]) - printf("<service index=\"%d\" name=\"%s\"%s>\n", n_svc++, svc.name, svc.disabled? " DISABLED": ""); + printf("<service index=\"%d\" name=\"%s\" status=\"%s\">\n", + n_svc++, svc.name, svc.disabled? "DISABLED": "active"); else printf("<service index=\"%d\"%s>\n", n_svc++, svc.disabled? " DISABLED": ""); } else { @@ -203,6 +210,7 @@ return res; } +int main(const int argc, char argv) { CTRL_CMD cmd; @@ -221,7 +229,7 @@ memset(&cmd, 0, sizeof(cmd)); opterr = 0; i = 0; - while(!i && (c_opt = getopt(argc, argv, "c:LlSsBbNnX")) > 0) + while(!i && (c_opt = getopt(argc, argv, "c:LlSsBbNnXH")) > 0) switch(c_opt) { case 'c': sock_name = optarg; @@ -269,6 +277,9 @@ usage(arg0); d_sess = is_set = 1; break; + case 'H': + host_names = 1; + break; default: if(optopt == '1') { optind--; @@ -340,8 +351,9 @@ read(sock, &a, lstn.addr.ai_addrlen); lstn.addr.ai_addr = (struct sockaddr )&a; if(xml_out) - printf("<listener index=\"%d\" %s address=\"%s\"%s>\n", n_lstn++, lstn.ctx? "HTTPS": "HTTP", - prt_addr(&lstn.addr), lstn.disabled? " DISABLED": ""); + printf("<listener index=\"%d\" protocol=\"%s\" address=\"%s\" status=\"%s\">\n", + n_lstn++, lstn.ctx? "HTTPS": "http", + prt_addr(&lstn.addr), lstn.disabled? "DISABLED": "active"); else printf("%3d. %s Listener %s %s\n", n_lstn++, lstn.ctx? "HTTPS" : "http", prt_addr(&lstn.addr), lstn.disabled? "*D": "a");
[-] [+]	Changed	Pound-2.6.tgz/svc.c ^
@@ -1,6 +1,6 @@ /* * Pound - the reverse-proxy load-balancer - * Copyright (C) 2002-2007 Apsis GmbH + * Copyright (C) 2002-2010 Apsis GmbH * * This file is part of Pound. * @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * Pound is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -22,18 +22,22 @@ * P.O.Box * 8707 Uetikon am See * Switzerland - * Tel: +41-44-920 4904 * EMail: roseg@apsis.ch / #include "pound.h" +#ifndef LHASH_OF +#define LHASH_OF(x) LHASH +#define CHECKED_LHASH_OF(type, h) h +#endif + / * Add a new key/content pair to a hash table * the table should be already locked / static void -t_add(LHASH const tab, const char key, const void content, const size_t cont_len) +t_add(LHASH_OF(TABNODE) const tab, const char key, const void content, const size_t cont_len) { TABNODE t, old; @@ -54,7 +58,11 @@ } memcpy(t->content, content, cont_len); t->last_acc = time(NULL); +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) { +#else if((old = (TABNODE )lh_insert(tab, t)) != NULL) { +#endif free(old->key); free(old->content); free(old); @@ -69,7 +77,7 @@ * side-effect: update the time of last access / static void -t_find(LHASH const tab, char const key) +t_find(LHASH_OF(TABNODE) const tab, char const key) { TABNODE t, res; @@ -85,12 +93,16 @@ Delete a key / static void -t_remove(LHASH const tab, char const key) +t_remove(LHASH_OF(TABNODE) const tab, char const key) { TABNODE t, res; t.key = key; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) { +#else if((res = (TABNODE )lh_delete(tab, &t)) != NULL) { +#endif free(res->key); free(res->content); free(res); @@ -99,59 +111,87 @@ } typedef struct { - LHASH tab; - time_t lim; - void content; - int cont_len; + LHASH_OF(TABNODE) tab; + time_t lim; + void content; + int cont_len; } ALL_ARG; static void -t_old(TABNODE t, void arg) +t_old_doall_arg(TABNODE t, ALL_ARG a) { - ALL_ARG a; + TABNODE res; - a = (ALL_ARG )arg; if(t->last_acc < a->lim) - lh_delete(a->tab, t); +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, a->tab, t)) != NULL) { +#else + if((res = lh_delete(a->tab, t)) != NULL) { +#endif + free(res->key); + free(res->content); + free(res); + } return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE , void ) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG) +#else +#define t_old t_old_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE , ALL_ARG ) +#endif /* * Expire all old nodes / static void -t_expire(LHASH const tab, const time_t lim) +t_expire(LHASH_OF(TABNODE) const tab, const time_t lim) { ALL_ARG a; int down_load; a.tab = tab; a.lim = lim; - down_load = tab->down_load; - tab->down_load = 0; + down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; + CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a); +#else lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a); - tab->down_load = down_load; +#endif + CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; return; } static void -t_cont(TABNODE t, void arg) +t_cont_doall_arg(TABNODE t, ALL_ARG arg) { - ALL_ARG a; + TABNODE res; - a = (ALL_ARG )arg; - if(memcmp(t->content, a->content, a->cont_len) == 0) - lh_delete(a->tab, t); + if(memcmp(t->content, arg->content, arg->cont_len) == 0) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, arg->tab, t)) != NULL) { +#else + if((res = lh_delete(arg->tab, t)) != NULL) { +#endif + free(res->key); + free(res->content); + free(res); + } return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE , void ) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG) +#else +#define t_cont t_cont_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE , ALL_ARG ) +#endif /* * Remove all nodes with the given content / static void -t_clean(LHASH const tab, void const content, const size_t cont_len) +t_clean(LHASH_OF(TABNODE) const tab, void const content, const size_t cont_len) { ALL_ARG a; int down_load; @@ -159,10 +199,14 @@ a.tab = tab; a.content = content; a.cont_len = cont_len; - down_load = tab->down_load; - tab->down_load = 0; + down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; + CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a); +#else lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a); - tab->down_load = down_load; +#endif + CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; return; } @@ -261,6 +305,70 @@ } / + * Parse a URL, possibly decoding hexadecimal-encoded characters + / +int +cpURL(char res, char src, int len) +{ + int state; + char kp_res; + + for(kp_res = res, state = 0; len > 0; len--) + switch(state) { + case 1: + if(src >= '0' && src <= '9') { + res = src++ - '0'; + state = 2; + } else if(src >= 'A' && src <= 'F') { + res = src++ - 'A' + 10; + state = 2; + } else if(src >= 'a' && src <= 'f') { + res = src++ - 'a' + 10; + state = 2; + } else { + res++ = '%'; + res++ = src++; + state = 0; + } + break; + case 2: + if(src >= '0' && src <= '9') { + res = res 16 + src++ - '0'; + res++; + state = 0; + } else if(src >= 'A' && src <= 'F') { + res = res 16 + src++ - 'A' + 10; + res++; + state = 0; + } else if(src >= 'a' && src <= 'f') { + res = res 16 + src++ - 'a' + 10; + res++; + state = 0; + } else { + res++ = '%'; + res++ = (src - 1); + res++ = src++; + state = 0; + } + break; + default: + if(src != '%') + res++ = src++; + else { + src++; + state = 1; + } + break; + } + if(state > 0) + res++ = '%'; + if(state > 1) + res++ = (src - 1); + res = '\0'; + return res - kp_res; +} + +/ * Parse a header * return a code and possibly content in the arg / @@ -368,16 +476,21 @@ static int get_REQUEST(char res, const SERVICE svc, const char request) { - int n; + int n, s; regmatch_t matches[4]; - if(regexec(&svc->sess_pat, request, 4, matches, 0)) { + if(regexec(&svc->sess_start, request, 4, matches, 0)) { + res[0] = '\0'; + return 0; + } + s = matches[0].rm_eo; + if(regexec(&svc->sess_pat, request + s, 4, matches, 0)) { res[0] = '\0'; return 0; } if((n = matches[1].rm_eo - matches[1].rm_so) > KEY_SIZE) n = KEY_SIZE; - strncpy(res, request + matches[1].rm_so, n); + strncpy(res, request + s + matches[1].rm_so, n); res[n] = '\0'; return 1; } @@ -385,7 +498,7 @@ static int get_HEADERS(char res, const SERVICE svc, char *const headers) { - int i, n; + int i, n, s; regmatch_t matches[4]; / this will match SESS_COOKIE, SESS_HEADER and SESS_BASIC / @@ -393,11 +506,14 @@ for(i = 0; i < (MAXHEADERS - 1); i++) { if(headers[i] == NULL) continue; - if(regexec(&svc->sess_pat, headers[i], 4, matches, 0)) + if(regexec(&svc->sess_start, headers[i], 4, matches, 0)) + continue; + s = matches[0].rm_eo; + if(regexec(&svc->sess_pat, headers[i] + s, 4, matches, 0)) continue; if((n = matches[1].rm_eo - matches[1].rm_so) > KEY_SIZE) n = KEY_SIZE; - strncpy(res, headers[i] + matches[1].rm_so, n); + strncpy(res, headers[i] + s + matches[1].rm_so, n); res[n] = '\0'; } return res[0] != '\0'; @@ -437,7 +553,7 @@ hv = 2166136261; while(key) - hv = (hv ^ key++) 16777619; + hv = ((hv ^ key++) 16777619) & 0xFFFFFFFF; pri = hv % abs_pri; for(tb = be; tb; tb = tb->next) if((pri -= tb->priority) < 0) @@ -464,28 +580,31 @@ { BACKEND res; char key[KEY_SIZE + 1]; - int ret_val; + int ret_val, no_be; void vp; - if(svc->tot_pri <= 0) - /* it might be NULL, but that is OK / - return svc->emergency; - if(ret_val = pthread_mutex_lock(&svc->mut)) logmsg(LOG_WARNING, "get_backend() lock: %s", strerror(ret_val)); + + no_be = (svc->tot_pri <= 0); + switch(svc->sess_type) { case SESS_NONE: / choose one back-end randomly / - res = rand_backend(svc->backends, random() % svc->tot_pri); + res = no_be? svc->emergency: rand_backend(svc->backends, random() % svc->tot_pri); break; case SESS_IP: addr2str(key, KEY_SIZE, from_host, 1); if(svc->sess_ttl < 0) - res = hash_backend(svc->backends, svc->abs_pri, key); + res = no_be? svc->emergency: hash_backend(svc->backends, svc->abs_pri, key); else if((vp = t_find(svc->sessions, key)) == NULL) { - / no session yet - create one / - res = rand_backend(svc->backends, random() % svc->tot_pri); - t_add(svc->sessions, key, &res, sizeof(res)); + if(no_be) + res = svc->emergency; + else { + / no session yet - create one / + res = rand_backend(svc->backends, random() % svc->tot_pri); + t_add(svc->sessions, key, &res, sizeof(res)); + } } else memcpy(&res, vp, sizeof(res)); break; @@ -493,30 +612,38 @@ case SESS_PARM: if(get_REQUEST(key, svc, request)) { if(svc->sess_ttl < 0) - res = hash_backend(svc->backends, svc->abs_pri, key); + res = no_be? svc->emergency: hash_backend(svc->backends, svc->abs_pri, key); else if((vp = t_find(svc->sessions, key)) == NULL) { - / no session yet - create one / - res = rand_backend(svc->backends, random() % svc->tot_pri); - t_add(svc->sessions, key, &res, sizeof(res)); + if(no_be) + res = svc->emergency; + else { + / no session yet - create one / + res = rand_backend(svc->backends, random() % svc->tot_pri); + t_add(svc->sessions, key, &res, sizeof(res)); + } } else memcpy(&res, vp, sizeof(res)); } else { - res = rand_backend(svc->backends, random() % svc->tot_pri); + res = no_be? svc->emergency: rand_backend(svc->backends, random() % svc->tot_pri); } break; default: / this works for SESS_BASIC, SESS_HEADER and SESS_COOKIE / if(get_HEADERS(key, svc, headers)) { if(svc->sess_ttl < 0) - res = hash_backend(svc->backends, svc->abs_pri, key); + res = no_be? svc->emergency: hash_backend(svc->backends, svc->abs_pri, key); else if((vp = t_find(svc->sessions, key)) == NULL) { - / no session yet - create one / - res = rand_backend(svc->backends, random() % svc->tot_pri); - t_add(svc->sessions, key, &res, sizeof(res)); + if(no_be) + res = svc->emergency; + else { + / no session yet - create one / + res = rand_backend(svc->backends, random() % svc->tot_pri); + t_add(svc->sessions, key, &res, sizeof(res)); + } } else memcpy(&res, vp, sizeof(res)); } else { - res = rand_backend(svc->backends, random() % svc->tot_pri); + res = no_be? svc->emergency: rand_backend(svc->backends, random() % svc->tot_pri); } break; } @@ -549,7 +676,7 @@ / * mark a backend host as dead/disabled; remove its sessions if necessary - * disable_only == 1: mark as disabled, remove sessions + * disable_only == 1: mark as disabled * disable_only == 0: mark as dead, remove sessions * disable_only == -1: mark as enabled / @@ -634,9 +761,13 @@ hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; if((ret_val = getaddrinfo(name, NULL, &hints, &chain)) == 0) { +#ifdef _AIX + ap = chain; +#else for(ap = chain; ap != NULL; ap = ap->ai_next) if(ap->ai_socktype == SOCK_STREAM) break; +#endif if(ap == NULL) { freeaddrinfo(chain); return EAI_NONAME; @@ -662,13 +793,13 @@ (2) if the redirect was done to the back-end rather than the listener / int -need_rewrite(const int rewr_loc, char const location, char const path, const LISTENER lstn, const BACKEND be) +need_rewrite(const int rewr_loc, char const location, char const path, const char v_host, const LISTENER lstn, const BACKEND be) { struct addrinfo addr; struct sockaddr_in in_addr, be_addr; struct sockaddr_in6 in6_addr, be6_addr; regmatch_t matches[4]; - char proto, host, port; + char proto, host, port, cp, buf[MAXBUF]; int ret_val; / check if rewriting is required at all / @@ -706,37 +837,31 @@ free(addr.ai_addr); return 0; } + memset(buf, '\0', MAXBUF); + strncpy(buf, v_host, MAXBUF - 1); + if((cp = strchr(buf, ':')) != NULL) + cp = '\0'; if(addr.ai_family == AF_INET) { - memcpy(&in_addr, addr.ai_addr, sizeof(in_addr)); - memcpy(&be_addr, be->addr.ai_addr, sizeof(be_addr)); - if(port) - in_addr.sin_port = (in_port_t)htons(atoi(port)); - else if(!strcasecmp(proto, "https")) - in_addr.sin_port = (in_port_t)htons(443); - else - in_addr.sin_port = (in_port_t)htons(80); /* - * check if the Location points to the back-end + * check if the Location points to the Listener but with the wrong port or protocol / - if(memcmp(&be_addr.sin_addr.s_addr, &in_addr.sin_addr.s_addr, sizeof(in_addr.sin_addr.s_addr)) == 0 - && memcmp(&be_addr.sin_port, &in_addr.sin_port, sizeof(in_addr.sin_port)) == 0) { + memcpy(&be_addr, lstn->addr.ai_addr, sizeof(be_addr)); + if((memcmp(&be_addr.sin_addr.s_addr, &in_addr.sin_addr.s_addr, sizeof(in_addr.sin_addr.s_addr)) == 0 + \|\| strcasecmp(host, buf) == 0) + && (memcmp(&be_addr.sin_port, &in_addr.sin_port, sizeof(in_addr.sin_port)) != 0 + \|\| strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { free(addr.ai_addr); return 1; } - } else { - memcpy(&in6_addr, addr.ai_addr, sizeof(in6_addr)); - memcpy(&be6_addr, be->addr.ai_addr, sizeof(be6_addr)); - if(port) - in6_addr.sin6_port = (in_port_t)htons(atoi(port)); - else if(!strcasecmp(proto, "https")) - in6_addr.sin6_port = (in_port_t)htons(443); - else - in6_addr.sin6_port = (in_port_t)htons(80); + } else / AF_INET6 / { / - * check if the Location points to the back-end + * check if the Location points to the Listener but with the wrong port or protocol / - if(memcmp(&be6_addr.sin6_addr.s6_addr, &in6_addr.sin6_addr.s6_addr, sizeof(in6_addr.sin6_addr.s6_addr)) == 0 - && memcmp(&be6_addr.sin6_port, &in6_addr.sin6_port, sizeof(in6_addr.sin6_port)) == 0) { + memcpy(&be6_addr, lstn->addr.ai_addr, sizeof(be6_addr)); + if((memcmp(&be6_addr.sin6_addr.s6_addr, &in6_addr.sin6_addr.s6_addr, sizeof(in6_addr.sin6_addr.s6_addr)) == 0 + \|\| strcasecmp(host, buf) == 0) + && (memcmp(&be6_addr.sin6_port, &in6_addr.sin6_port, sizeof(in6_addr.sin6_port)) != 0 + \|\| strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { free(addr.ai_addr); return 1; } @@ -757,7 +882,7 @@ / if(memcmp(&be_addr.sin_addr.s_addr, &in_addr.sin_addr.s_addr, sizeof(in_addr.sin_addr.s_addr)) == 0 && (memcmp(&be_addr.sin_port, &in_addr.sin_port, sizeof(in_addr.sin_port)) != 0 - \|\| strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { + \|\| strcasecmp(proto, lstn->ctx? "http": "https"))) { free(addr.ai_addr); return 1; } @@ -769,7 +894,7 @@ / if(memcmp(&be6_addr.sin6_addr.s6_addr, &in6_addr.sin6_addr.s6_addr, sizeof(in6_addr.sin6_addr.s6_addr)) == 0 && (memcmp(&be6_addr.sin6_port, &in6_addr.sin6_port, sizeof(in6_addr.sin6_port)) != 0 - \|\| strcasecmp(proto, (lstn->ctx == NULL)? "http": "https"))) { + \|\| strcasecmp(proto, lstn->ctx? "http": "https"))) { free(addr.ai_addr); return 1; } @@ -897,7 +1022,7 @@ default: continue; } - if(connect_nb(sock, &be->ha_addr, be->to) != 0) { + if(connect_nb(sock, &be->ha_addr, be->conn_to) != 0) { kill_be(svc, be, BE_KILL); str_be(buf, MAXBUF - 1, be); logmsg(LOG_NOTICE, "BackEnd %s is dead (HA)", buf); @@ -933,7 +1058,7 @@ default: continue; } - if(connect_nb(sock, &be->ha_addr, be->to) != 0) { + if(connect_nb(sock, &be->ha_addr, be->conn_to) != 0) { kill_be(svc, be, BE_KILL); str_be(buf, MAXBUF - 1, be); logmsg(LOG_NOTICE, "BackEnd %s is dead (HA)", buf); @@ -988,7 +1113,7 @@ } addr = &be->ha_addr; } - if(connect_nb(sock, addr, be->to) == 0) { + if(connect_nb(sock, addr, be->conn_to) == 0) { be->resurrect = 1; modified = 1; } @@ -1057,7 +1182,7 @@ } addr = &be->ha_addr; } - if(connect_nb(sock, addr, be->to) == 0) { + if(connect_nb(sock, addr, be->conn_to) == 0) { be->resurrect = 1; modified = 1; } @@ -1289,20 +1414,37 @@ do_RSAgen(void) { int n, ret_val; + RSA t_RSA512_keys[N_RSA_KEYS]; + RSA t_RSA1024_keys[N_RSA_KEYS]; + for(n = 0; n < N_RSA_KEYS; n++) { + t_RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL); + t_RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL); + } if(ret_val = pthread_mutex_lock(&RSA_mut)) logmsg(LOG_WARNING, "thr_RSAgen() lock: %s", strerror(ret_val)); for(n = 0; n < N_RSA_KEYS; n++) { RSA_free(RSA512_keys[n]); - RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL); + RSA512_keys[n] = t_RSA512_keys[n]; RSA_free(RSA1024_keys[n]); - RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL); + RSA1024_keys[n] = t_RSA1024_keys[n]; } if(ret_val = pthread_mutex_unlock(&RSA_mut)) logmsg(LOG_WARNING, "thr_RSAgen() unlock: %s", strerror(ret_val)); return; } +#include "dh512.h" +#include "dh1024.h" + +static DH DH512_params, DH1024_params; + +DH +DH_tmp_callback(/* not used /SSL s, /* not used /int is_export, int keylength) +{ + return keylength == 512? DH512_params: DH1024_params; +} + static time_t last_RSA, last_rescale, last_alive, last_expire; / @@ -1332,6 +1474,9 @@ /* pthread_mutex_init() always returns 0 / pthread_mutex_init(&RSA_mut, NULL); + DH512_params = get_dh512(); + DH1024_params = get_dh1024(); + return; } @@ -1385,41 +1530,47 @@ } DUMP_ARG; static void -t_dump(TABNODE t, void arg) +t_dump_doall_arg(TABNODE t, DUMP_ARG arg) { - DUMP_ARG a; BACKEND be, bep; int n_be, sz; - a = (DUMP_ARG )arg; memcpy(&bep, t->content, sizeof(bep)); - for(n_be = 0, be = a->backends; be; be = be->next, n_be++) + for(n_be = 0, be = arg->backends; be; be = be->next, n_be++) if(be == bep) break; if(!be) / should NEVER happen / n_be = 0; - write(a->control_sock, t, sizeof(TABNODE)); - write(a->control_sock, &n_be, sizeof(n_be)); + (void)write(arg->control_sock, t, sizeof(TABNODE)); + (void)write(arg->control_sock, &n_be, sizeof(n_be)); sz = strlen(t->key); - write(a->control_sock, &sz, sizeof(sz)); - write(a->control_sock, t->key, sz); + (void)write(arg->control_sock, &sz, sizeof(sz)); + (void)write(arg->control_sock, t->key, sz); return; } - -IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE , void ) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG) +#else +#define t_dump t_dump_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE , DUMP_ARG ) +#endif / * write sessions to the control socket / static void -dump_sess(const int control_sock, LHASH const sess, BACKEND const backends) +dump_sess(const int control_sock, LHASH_OF(TABNODE) const sess, BACKEND const backends) { DUMP_ARG a; a.control_sock = control_sock; a.backends = backends; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a); +#else lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a); +#endif return; } @@ -1526,17 +1677,17 @@ case CTRL_LST: / logmsg(LOG_INFO, "thr_control() list"); / for(lstn = listeners; lstn; lstn = lstn->next) { - write(ctl, (void )lstn, sizeof(LISTENER)); - write(ctl, lstn->addr.ai_addr, lstn->addr.ai_addrlen); + (void)write(ctl, (void )lstn, sizeof(LISTENER)); + (void)write(ctl, lstn->addr.ai_addr, lstn->addr.ai_addrlen); for(svc = lstn->services; svc; svc = svc->next) { - write(ctl, (void )svc, sizeof(SERVICE)); + (void)write(ctl, (void )svc, sizeof(SERVICE)); for(be = svc->backends; be; be = be->next) { - write(ctl, (void )be, sizeof(BACKEND)); - write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); + (void)write(ctl, (void )be, sizeof(BACKEND)); + (void)write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); if(be->ha_addr.ai_addrlen > 0) - write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); + (void)write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); } - write(ctl, (void )&dummy_be, sizeof(BACKEND)); + (void)write(ctl, (void )&dummy_be, sizeof(BACKEND)); if(dummy = pthread_mutex_lock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() lock: %s", strerror(dummy)); else { @@ -1544,20 +1695,20 @@ if(dummy = pthread_mutex_unlock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() unlock: %s", strerror(dummy)); } - write(ctl, (void )&dummy_sess, sizeof(TABNODE)); + (void)write(ctl, (void )&dummy_sess, sizeof(TABNODE)); } - write(ctl, (void )&dummy_svc, sizeof(SERVICE)); + (void)write(ctl, (void )&dummy_svc, sizeof(SERVICE)); } - write(ctl, (void )&dummy_lstn, sizeof(LISTENER)); + (void)write(ctl, (void )&dummy_lstn, sizeof(LISTENER)); for(svc = services; svc; svc = svc->next) { - write(ctl, (void )svc, sizeof(SERVICE)); + (void)write(ctl, (void )svc, sizeof(SERVICE)); for(be = svc->backends; be; be = be->next) { - write(ctl, (void )be, sizeof(BACKEND)); - write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); + (void)write(ctl, (void )be, sizeof(BACKEND)); + (void)write(ctl, be->addr.ai_addr, be->addr.ai_addrlen); if(be->ha_addr.ai_addrlen > 0) - write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); + (void)write(ctl, be->ha_addr.ai_addr, be->ha_addr.ai_addrlen); } - write(ctl, (void )&dummy_be, sizeof(BACKEND)); + (void)write(ctl, (void )&dummy_be, sizeof(BACKEND)); if(dummy = pthread_mutex_lock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() lock: %s", strerror(dummy)); else { @@ -1565,9 +1716,9 @@ if(dummy = pthread_mutex_unlock(&svc->mut)) logmsg(LOG_WARNING, "thr_control() unlock: %s", strerror(dummy)); } - write(ctl, (void )&dummy_sess, sizeof(TABNODE)); + (void)write(ctl, (void )&dummy_sess, sizeof(TABNODE)); } - write(ctl, (void )&dummy_svc, sizeof(SERVICE)); + (void)write(ctl, (void *)&dummy_svc, sizeof(SERVICE)); break; case CTRL_EN_LSTN: if((lstn = sel_lstn(&cmd)) == NULL)
[-] [+]	Added	init.pound ^
@@ -0,0 +1,72 @@ +#! /bin/sh +# Copyright (c) 1995-1998 SuSE GmbH Nuernberg, Germany. +# +# Author: adrian@suse.de, template by ro@suse.de +# +# /etc/init.d/pound +# and its symbolic link +# /usr/sbin/rcpound +# +### BEGIN INIT INFO +# Provides: pound +# Required-Start: $time $remote_fs $named $syslog +# Required-Stop: $null +# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 +# Description: A lightweight HTTP proxy +# Short-Description: A lightweight HTTP proxy +### END INIT INFO + +. /etc/rc.status + + +# Determine the base and follow a runlevel link name. +base=${0##/} +link=${base#[SK][0-9][0-9]} + +# Force execution if not called by a runlevel directory. +test -x /usr/sbin/pound \|\| exit 0 + +rc_reset +case "$1" in + start) + echo -n "Starting Pound HTTP Proxy" + startproc /usr/sbin/pound + rc_status -v + ;; + stop) + echo -n "Shutting down Pound HTTP Proxy" + killproc -TERM /usr/sbin/pound + rc_status -v + ;; + restart) + ## If first returns OK call the second, if first or + ## second command fails, set echo return value. + $0 stop && $0 start + rc_status + ;; + force-reload) + ## If first returns OK call the second, if first or + ## second command fails, set echo return value. + $0 stop; sleep 1 && $0 start + rc_status + ;; + reload) + $0 stop; sleep 1 && $0 start + rc_status + ;; + status) + echo -n "Checking for Pound HTTP Proxy Daemon: " + checkproc /usr/sbin/pound + rc_status -v + ;; + configtest) + echo "Checking Pound configuration ..." + eval /usr/sbin/pound -c + ;; + *) + echo "Usage: $0 {start\|stop\|status\|restart\|reload\|configtest}" + exit 1 + ;; +esac +rc_exit

Difference Between Revision 8 and home:jg / pound