diff options
| -rw-r--r-- | Modules/getaddrinfo.c | 32 | ||||
| -rw-r--r-- | Modules/getnameinfo.c | 12 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 22 | ||||
| -rwxr-xr-x | configure | 400 | ||||
| -rw-r--r-- | configure.in | 18 |
5 files changed, 236 insertions, 248 deletions
diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c index 5d92608..6731c6c 100644 --- a/Modules/getaddrinfo.c +++ b/Modules/getaddrinfo.c @@ -57,7 +57,7 @@ #include "addrinfo.h" #endif -#if defined(__KAME__) && defined(INET6) +#if defined(__KAME__) && defined(ENABLE_IPV6) # define FAITH #endif @@ -94,7 +94,7 @@ static struct gai_afd { const char *a_addrany; const char *a_loopback; } gai_afdl [] = { -#ifdef INET6 +#ifdef ENABLE_IPV6 #define N_INET6 0 {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6), @@ -111,7 +111,7 @@ static struct gai_afd { {0, 0, 0, 0, NULL, NULL}, }; -#ifdef INET6 +#ifdef ENABLE_IPV6 #define PTON_MAX 16 #else #define PTON_MAX 4 @@ -288,7 +288,7 @@ getaddrinfo(const char*hostname, const char*servname, switch (hints->ai_family) { case PF_UNSPEC: case PF_INET: -#ifdef INET6 +#ifdef ENABLE_IPV6 case PF_INET6: #endif break; @@ -417,7 +417,7 @@ getaddrinfo(const char*hostname, const char*servname, for (i = 0; gai_afdl[i].a_af; i++) { if (inet_pton(gai_afdl[i].a_af, hostname, pton)) { u_long v4a; -#ifdef INET6 +#ifdef ENABLE_IPV6 u_char pfx; #endif @@ -430,7 +430,7 @@ getaddrinfo(const char*hostname, const char*servname, if (v4a == 0 || v4a == IN_LOOPBACKNET) pai->ai_flags &= ~AI_CANONNAME; break; -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: pfx = ((struct in6_addr *)pton)->s6_addr8[0]; if (pfx == 0 || pfx == 0xfe || pfx == 0xff) @@ -495,11 +495,11 @@ get_name(addr, gai_afd, res, numaddr, pai, port0) struct hostent *hp; struct addrinfo *cur; int error = 0; -#ifdef INET6 +#ifdef ENABLE_IPV6 int h_error; #endif -#ifdef INET6 +#ifdef ENABLE_IPV6 hp = getipnodebyaddr(addr, gai_afd->a_addrlen, gai_afd->a_af, &h_error); #else hp = gethostbyaddr(addr, gai_afd->a_addrlen, AF_INET); @@ -510,7 +510,7 @@ get_name(addr, gai_afd, res, numaddr, pai, port0) } else GET_AI(cur, gai_afd, numaddr, port); -#ifdef INET6 +#ifdef ENABLE_IPV6 if (hp) freehostent(hp); #endif @@ -519,7 +519,7 @@ get_name(addr, gai_afd, res, numaddr, pai, port0) free: if (cur) freeaddrinfo(cur); -#ifdef INET6 +#ifdef ENABLE_IPV6 if (hp) freehostent(hp); #endif @@ -547,7 +547,7 @@ get_addr(hostname, af, res, pai, port0) top = NULL; sentinel.ai_next = NULL; cur = &sentinel; -#ifdef INET6 +#ifdef ENABLE_IPV6 if (af == AF_UNSPEC) { hp = getipnodebyname(hostname, AF_INET6, AI_ADDRCONFIG|AI_ALL|AI_V4MAPPED, &h_error); @@ -582,18 +582,18 @@ get_addr(hostname, af, res, pai, port0) for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) { switch (af) { -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: gai_afd = &gai_afdl[N_INET6]; break; #endif -#ifndef INET6 +#ifndef ENABLE_IPV6 default: /* AF_UNSPEC */ #endif case AF_INET: gai_afd = &gai_afdl[N_INET]; break; -#ifdef INET6 +#ifdef ENABLE_IPV6 default: /* AF_UNSPEC */ if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) { ap += sizeof(struct in6_addr) - @@ -622,7 +622,7 @@ get_addr(hostname, af, res, pai, port0) } cur = cur->ai_next; } -#ifdef INET6 +#ifdef ENABLE_IPV6 freehostent(hp); #endif *res = top; @@ -630,7 +630,7 @@ get_addr(hostname, af, res, pai, port0) free: if (top) freeaddrinfo(top); -#ifdef INET6 +#ifdef ENABLE_IPV6 if (hp) freehostent(hp); #endif diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c index 4827bc6..d3c0ac5 100644 --- a/Modules/getnameinfo.c +++ b/Modules/getnameinfo.c @@ -58,7 +58,7 @@ static struct gni_afd { int a_socklen; int a_off; } gni_afdl [] = { -#ifdef INET6 +#ifdef ENABLE_IPV6 {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6), offsetof(struct sockaddr_in6, sin6_addr)}, #endif @@ -102,7 +102,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) int family, len, i; char *addr, *p; u_long v4a; -#ifdef INET6 +#ifdef ENABLE_IPV6 u_char pfx; #endif int h_error; @@ -159,7 +159,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) if (v4a == 0 || v4a == IN_LOOPBACKNET) flags |= NI_NUMERICHOST; break; -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0]; if (pfx == 0 || pfx == 0xfe || pfx == 0xff) @@ -177,7 +177,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) return ENI_MEMORY; strcpy(host, numaddr); } else { -#ifdef INET6 +#ifdef ENABLE_IPV6 hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error); #else hp = gethostbyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af); @@ -190,13 +190,13 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) if (p) *p = '\0'; } if (strlen(hp->h_name) > hostlen) { -#ifdef INET6 +#ifdef ENABLE_IPV6 freehostent(hp); #endif return ENI_MEMORY; } strcpy(host, hp->h_name); -#ifdef INET6 +#ifdef ENABLE_IPV6 freehostent(hp); #endif } else { diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index db91d8b..bbca138 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -479,7 +479,7 @@ typedef struct { #ifdef AF_UNIX struct sockaddr_un un; #endif -#ifdef INET6 +#ifdef ENABLE_IPV6 struct sockaddr_in6 in6; struct sockaddr_storage storage; #endif @@ -594,7 +594,7 @@ setipaddr(char* name, struct sockaddr * addr_ret, int af) case AF_INET: siz = 4; break; -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: siz = 16; break; @@ -651,7 +651,7 @@ setipaddr(char* name, struct sockaddr * addr_ret, int af) switch (addr_ret->sa_family) { case AF_INET: return 4; -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: return 16; #endif @@ -725,7 +725,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen) } #endif /* AF_UNIX */ -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: { struct sockaddr_in6 *a; @@ -830,7 +830,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, return 1; } -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: { struct sockaddr_in6* addr; @@ -919,7 +919,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) return 1; } -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: { *len_ret = sizeof (struct sockaddr_in6); @@ -1993,7 +1993,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af) if (alen < sizeof(struct sockaddr_in)) return NULL; break; -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: if (alen < sizeof(struct sockaddr_in6)) return NULL; @@ -2031,7 +2031,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af) memcpy((char *) addr, &sin, sizeof(sin)); break; } -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: { struct sockaddr_in6 sin6; @@ -2138,7 +2138,7 @@ for a host. The host argument is a string giving a host name or IP number."; static PyObject * PySocket_gethostbyaddr(PyObject *self, PyObject *args) { -#ifdef INET6 +#ifdef ENABLE_IPV6 struct sockaddr_storage addr; #else struct sockaddr_in addr; @@ -2177,7 +2177,7 @@ PySocket_gethostbyaddr(PyObject *self, PyObject *args) ap = (char *)&((struct sockaddr_in *)sa)->sin_addr; al = sizeof(((struct sockaddr_in *)sa)->sin_addr); break; -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr; al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr); @@ -2588,7 +2588,7 @@ PySocket_getnameinfo(PyObject *self, PyObject *args) } break; } -#ifdef INET6 +#ifdef ENABLE_IPV6 case AF_INET6: { struct sockaddr_in6 *sin6; @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.280 +# From configure.in Revision: 1.281 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -4446,15 +4446,14 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* - ipv6type=$i; - OPT="-DINET6 $OPT" + ipv6type=$i fi rm -f conftest* ;; kame) cat > conftest.$ac_ext <<EOF -#line 4458 "configure" +#line 4457 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -4469,14 +4468,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ipv6lib=inet6 ipv6libdir=/usr/local/v6/lib ipv6trylibc=yes - OPT="-DINET6 $OPT" fi rm -f conftest* ;; linux-glibc) cat > conftest.$ac_ext <<EOF -#line 4480 "configure" +#line 4478 "configure" #include "confdefs.h" #include <features.h> @@ -4489,7 +4487,6 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | rm -rf conftest* ipv6type=$i; ipv6trylibc=yes - OPT="-DINET6 $OPT" fi rm -f conftest* @@ -4499,7 +4496,7 @@ rm -f conftest* ipv6type=$i ipv6lib=inet6 ipv6libdir=/usr/inet6/lib - OPT="-DINET6 -I/usr/inet6/include $OPT" + OPT="-I/usr/inet6/include $OPT" fi ;; solaris) @@ -4507,13 +4504,12 @@ rm -f conftest* if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then ipv6type=$i ipv6trylibc=yes - OPT="-DINET6 $OPT" fi fi ;; toshiba) cat > conftest.$ac_ext <<EOF -#line 4517 "configure" +#line 4513 "configure" #include "confdefs.h" #include <sys/param.h> @@ -4526,15 +4522,14 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | rm -rf conftest* ipv6type=$i; ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - OPT="-DINET6 $OPT" + ipv6libdir=/usr/local/v6/lib fi rm -f conftest* ;; v6d) cat > conftest.$ac_ext <<EOF -#line 4538 "configure" +#line 4533 "configure" #include "confdefs.h" #include </usr/local/v6/include/sys/v6config.h> @@ -4555,7 +4550,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext <<EOF -#line 4559 "configure" +#line 4554 "configure" #include "confdefs.h" #include <sys/param.h> @@ -4568,8 +4563,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | rm -rf conftest* ipv6type=$i; ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - OPT="-DINET6 $OPT" + ipv6libdir=/usr/local/v6/lib fi rm -f conftest* @@ -4600,7 +4594,7 @@ fi # Check for GC support echo $ac_n "checking for --with-cycle-gc""... $ac_c" 1>&6 -echo "configure:4604: checking for --with-cycle-gc" >&5 +echo "configure:4598: checking for --with-cycle-gc" >&5 # Check whether --with-cycle-gc or --without-cycle-gc was given. if test "${with_cycle_gc+set}" = set; then withval="$with_cycle_gc" @@ -4622,7 +4616,7 @@ echo "$ac_t""$with_cycle_gc" 1>&6 # Check for Python-specific malloc support echo $ac_n "checking for --with-pymalloc""... $ac_c" 1>&6 -echo "configure:4626: checking for --with-pymalloc" >&5 +echo "configure:4620: checking for --with-pymalloc" >&5 # Check whether --with-pymalloc or --without-pymalloc was given. if test "${with_pymalloc+set}" = set; then withval="$with_pymalloc" @@ -4641,7 +4635,7 @@ fi # Check for --with-wctype-functions echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6 -echo "configure:4645: checking for --with-wctype-functions" >&5 +echo "configure:4639: checking for --with-wctype-functions" >&5 # Check whether --with-wctype-functions or --without-wctype-functions was given. if test "${with_wctype_functions+set}" = set; then withval="$with_wctype_functions" @@ -4663,7 +4657,7 @@ fi DLINCLDIR=. echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6 -echo "configure:4667: checking for --with-sgi-dl" >&5 +echo "configure:4661: checking for --with-sgi-dl" >&5 # Check whether --with-sgi-dl or --without-sgi-dl was given. if test "${with_sgi_dl+set}" = set; then withval="$with_sgi_dl" @@ -4687,7 +4681,7 @@ fi echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6 -echo "configure:4691: checking for --with-dl-dld" >&5 +echo "configure:4685: checking for --with-dl-dld" >&5 # Check whether --with-dl-dld or --without-dl-dld was given. if test "${with_dl_dld+set}" = set; then withval="$with_dl_dld" @@ -4716,12 +4710,12 @@ fi for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4720: checking for $ac_func" >&5 +echo "configure:4714: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4725 "configure" +#line 4719 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4744,7 +4738,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4773,7 +4767,7 @@ done # loading of modules. echo $ac_n "checking DYNLOADFILE""... $ac_c" 1>&6 -echo "configure:4777: checking DYNLOADFILE" >&5 +echo "configure:4771: checking DYNLOADFILE" >&5 if test -z "$DYNLOADFILE" then case $ac_sys_system/$ac_sys_release in @@ -4804,7 +4798,7 @@ fi echo $ac_n "checking MACHDEP_OBJS""... $ac_c" 1>&6 -echo "configure:4808: checking MACHDEP_OBJS" >&5 +echo "configure:4802: checking MACHDEP_OBJS" >&5 if test -z "$MACHDEP_OBJS" then MACHDEP_OBJS=$extra_machdep_objs @@ -4827,12 +4821,12 @@ for ac_func in alarm chown chroot clock confstr ctermid ctermid_r execv \ truncate uname unsetenv waitpid _getpty getpriority do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4831: checking for $ac_func" >&5 +echo "configure:4825: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4836 "configure" +#line 4830 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4855,7 +4849,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4885,12 +4879,12 @@ done for ac_func in openpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4889: checking for $ac_func" >&5 +echo "configure:4883: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4894 "configure" +#line 4888 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4913,7 +4907,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4935,7 +4929,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:4939: checking for openpty in -lutil" >&5 +echo "configure:4933: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4943,7 +4937,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 4947 "configure" +#line 4941 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4954,7 +4948,7 @@ int main() { openpty() ; return 0; } EOF -if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4983,12 +4977,12 @@ done for ac_func in forkpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4987: checking for $ac_func" >&5 +echo "configure:4981: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4992 "configure" +#line 4986 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5011,7 +5005,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5033,7 +5027,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for forkpty in -lutil""... $ac_c" 1>&6 -echo "configure:5037: checking for forkpty in -lutil" >&5 +echo "configure:5031: checking for forkpty in -lutil" >&5 ac_lib_var=`echo util'_'forkpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5041,7 +5035,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 5045 "configure" +#line 5039 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5052,7 +5046,7 @@ int main() { forkpty() ; return 0; } EOF -if { (eval echo configure:5056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5083,12 +5077,12 @@ done for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5087: checking for $ac_func" >&5 +echo "configure:5081: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5092 "configure" +#line 5086 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5111,7 +5105,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5139,12 +5133,12 @@ done for ac_func in dup2 getcwd strdup strerror memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5143: checking for $ac_func" >&5 +echo "configure:5137: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5148 "configure" +#line 5142 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5167,7 +5161,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5196,12 +5190,12 @@ done for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5200: checking for $ac_func" >&5 +echo "configure:5194: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5205 "configure" +#line 5199 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5224,7 +5218,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5243,14 +5237,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 5247 "configure" +#line 5241 "configure" #include "confdefs.h" #include <unistd.h> int main() { getpgrp(0); ; return 0; } EOF -if { (eval echo configure:5254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define GETPGRP_HAVE_ARG 1 @@ -5269,12 +5263,12 @@ done for ac_func in setpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5273: checking for $ac_func" >&5 +echo "configure:5267: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5278 "configure" +#line 5272 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5297,7 +5291,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5316,14 +5310,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 5320 "configure" +#line 5314 "configure" #include "confdefs.h" #include <unistd.h> int main() { setpgrp(0,0); ; return 0; } EOF -if { (eval echo configure:5327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SETPGRP_HAVE_ARG 1 @@ -5342,12 +5336,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5346: checking for $ac_func" >&5 +echo "configure:5340: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5351 "configure" +#line 5345 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5370,7 +5364,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5389,14 +5383,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 5393 "configure" +#line 5387 "configure" #include "confdefs.h" #include <sys/time.h> int main() { gettimeofday((struct timeval*)0,(struct timezone*)0); ; return 0; } EOF -if { (eval echo configure:5400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5418,9 +5412,9 @@ done # On OSF/1 V5.1, getaddrinfo is available, but a define # for [no]getaddrinfo in netdb.h. echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:5422: checking for getaddrinfo" >&5 +echo "configure:5416: checking for getaddrinfo" >&5 cat > conftest.$ac_ext <<EOF -#line 5424 "configure" +#line 5418 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5434,18 +5428,18 @@ getaddrinfo(NULL, NULL, NULL, NULL); ; return 0; } EOF -if { (eval echo configure:5438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 echo $ac_n "checking getaddrinfo bug""... $ac_c" 1>&6 -echo "configure:5443: checking getaddrinfo bug" >&5 +echo "configure:5437: checking getaddrinfo bug" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""buggy" 1>&6 buggygetaddrinfo=yes else cat > conftest.$ac_ext <<EOF -#line 5449 "configure" +#line 5443 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5534,7 +5528,7 @@ main() } EOF -if { (eval echo configure:5538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""good" 1>&6 buggygetaddrinfo=no @@ -5574,12 +5568,12 @@ fi for ac_func in getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5578: checking for $ac_func" >&5 +echo "configure:5572: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5583 "configure" +#line 5577 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5602,7 +5596,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5629,12 +5623,12 @@ done # checks for structures echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:5633: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5627: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5638 "configure" +#line 5632 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -5643,7 +5637,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:5647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -5664,12 +5658,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5668: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5662: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5673 "configure" +#line 5667 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5677,7 +5671,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5698,12 +5692,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5702: checking for tm_zone in struct tm" >&5 +echo "configure:5696: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5707 "configure" +#line 5701 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -5711,7 +5705,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5731,12 +5725,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5735: checking for tzname" >&5 +echo "configure:5729: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5740 "configure" +#line 5734 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -5746,7 +5740,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5768,12 +5762,12 @@ EOF fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:5772: checking for st_rdev in struct stat" >&5 +echo "configure:5766: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5777 "configure" +#line 5771 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5781,7 +5775,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:5785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -5802,12 +5796,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:5806: checking for st_blksize in struct stat" >&5 +echo "configure:5800: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5811 "configure" +#line 5805 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5815,7 +5809,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:5819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -5836,12 +5830,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:5840: checking for st_blocks in struct stat" >&5 +echo "configure:5834: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5845 "configure" +#line 5839 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5849,7 +5843,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:5853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -5873,19 +5867,19 @@ fi echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6 -echo "configure:5877: checking for time.h that defines altzone" >&5 +echo "configure:5871: checking for time.h that defines altzone" >&5 if eval "test \"`echo '$''{'ac_cv_header_time_altzone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5882 "configure" +#line 5876 "configure" #include "confdefs.h" #include <time.h> int main() { return altzone; ; return 0; } EOF -if { (eval echo configure:5889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time_altzone=yes else @@ -5907,9 +5901,9 @@ fi was_it_defined=no echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:5911: checking whether sys/select.h and sys/time.h may both be included" >&5 +echo "configure:5905: checking whether sys/select.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext <<EOF -#line 5913 "configure" +#line 5907 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5920,7 +5914,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:5924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SYS_SELECT_WITH_SYS_TIME 1 @@ -5934,12 +5928,12 @@ rm -f conftest* echo "$ac_t""$was_it_defined" 1>&6 echo $ac_n "checking for addrinfo""... $ac_c" 1>&6 -echo "configure:5938: checking for addrinfo" >&5 +echo "configure:5932: checking for addrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_struct_addrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5943 "configure" +#line 5937 "configure" #include "confdefs.h" # include <netdb.h> @@ -5947,7 +5941,7 @@ int main() { struct addrinfo a ; return 0; } EOF -if { (eval echo configure:5951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_addrinfo=yes else @@ -5968,12 +5962,12 @@ EOF fi echo $ac_n "checking for sockaddr_storage""... $ac_c" 1>&6 -echo "configure:5972: checking for sockaddr_storage" >&5 +echo "configure:5966: checking for sockaddr_storage" >&5 if eval "test \"`echo '$''{'ac_cv_struct_sockaddr_storage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5977 "configure" +#line 5971 "configure" #include "confdefs.h" # include <sys/types.h> @@ -5982,7 +5976,7 @@ int main() { struct sockaddr_storage s ; return 0; } EOF -if { (eval echo configure:5986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_sockaddr_storage=yes else @@ -6005,14 +5999,14 @@ fi # checks for compiler characteristics echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:6009: checking whether char is unsigned" >&5 +echo "configure:6003: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <<EOF -#line 6016 "configure" +#line 6010 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -6034,7 +6028,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 6038 "configure" +#line 6032 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -6044,7 +6038,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:6048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -6068,12 +6062,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6072: checking for working const" >&5 +echo "configure:6066: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6077 "configure" +#line 6071 "configure" #include "confdefs.h" int main() { @@ -6122,7 +6116,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:6126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6145,16 +6139,16 @@ fi works=no echo $ac_n "checking for working volatile""... $ac_c" 1>&6 -echo "configure:6149: checking for working volatile" >&5 +echo "configure:6143: checking for working volatile" >&5 cat > conftest.$ac_ext <<EOF -#line 6151 "configure" +#line 6145 "configure" #include "confdefs.h" int main() { volatile int x; x = 0; ; return 0; } EOF -if { (eval echo configure:6158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -6171,16 +6165,16 @@ echo "$ac_t""$works" 1>&6 works=no echo $ac_n "checking for working signed char""... $ac_c" 1>&6 -echo "configure:6175: checking for working signed char" >&5 +echo "configure:6169: checking for working signed char" >&5 cat > conftest.$ac_ext <<EOF -#line 6177 "configure" +#line 6171 "configure" #include "confdefs.h" int main() { signed char c; ; return 0; } EOF -if { (eval echo configure:6184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -6197,16 +6191,16 @@ echo "$ac_t""$works" 1>&6 have_prototypes=no echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:6201: checking for prototypes" >&5 +echo "configure:6195: checking for prototypes" >&5 cat > conftest.$ac_ext <<EOF -#line 6203 "configure" +#line 6197 "configure" #include "confdefs.h" int foo(int x) { return 0; } int main() { return foo(10); ; return 0; } EOF -if { (eval echo configure:6210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_PROTOTYPES 1 @@ -6221,9 +6215,9 @@ echo "$ac_t""$have_prototypes" 1>&6 works=no echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:6225: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:6219: checking for variable length prototypes and stdarg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6227 "configure" +#line 6221 "configure" #include "confdefs.h" #include <stdarg.h> @@ -6240,7 +6234,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:6244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STDARG_PROTOTYPES 1 @@ -6256,16 +6250,16 @@ echo "$ac_t""$works" 1>&6 if test "$have_prototypes" = yes; then bad_prototypes=no echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6 -echo "configure:6260: checking for bad exec* prototypes" >&5 +echo "configure:6254: checking for bad exec* prototypes" >&5 cat > conftest.$ac_ext <<EOF -#line 6262 "configure" +#line 6256 "configure" #include "confdefs.h" #include <unistd.h> int main() { char **t;execve("@",t,t); ; return 0; } EOF -if { (eval echo configure:6269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6282,9 +6276,9 @@ fi # check if sockaddr has sa_len member echo $ac_n "checking if sockaddr has sa_len member""... $ac_c" 1>&6 -echo "configure:6286: checking if sockaddr has sa_len member" >&5 +echo "configure:6280: checking if sockaddr has sa_len member" >&5 cat > conftest.$ac_ext <<EOF -#line 6288 "configure" +#line 6282 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6293,7 +6287,7 @@ struct sockaddr x; x.sa_len = 0; ; return 0; } EOF -if { (eval echo configure:6297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -6309,7 +6303,7 @@ fi rm -f conftest* echo $ac_n "checking for bad static forward""... $ac_c" 1>&6 -echo "configure:6313: checking for bad static forward" >&5 +echo "configure:6307: checking for bad static forward" >&5 if eval "test \"`echo '$''{'ac_cv_bad_static_forward'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6317,7 +6311,7 @@ else ac_cv_bad_static_forward=no else cat > conftest.$ac_ext <<EOF -#line 6321 "configure" +#line 6315 "configure" #include "confdefs.h" struct s { int a; int b; }; @@ -6332,7 +6326,7 @@ main() { exit(!((int)&foo == foobar())); } EOF -if { (eval echo configure:6336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_bad_static_forward=no else @@ -6357,9 +6351,9 @@ fi va_list_is_array=no echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&6 -echo "configure:6361: checking whether va_list is an array" >&5 +echo "configure:6355: checking whether va_list is an array" >&5 cat > conftest.$ac_ext <<EOF -#line 6363 "configure" +#line 6357 "configure" #include "confdefs.h" #ifdef HAVE_STDARG_PROTOTYPES @@ -6372,7 +6366,7 @@ int main() { va_list list1, list2; list1 = list2; ; return 0; } EOF -if { (eval echo configure:6376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6388,12 +6382,12 @@ echo "$ac_t""$va_list_is_array" 1>&6 # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-( echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:6392: checking for gethostbyname_r" >&5 +echo "configure:6386: checking for gethostbyname_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6397 "configure" +#line 6391 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname_r(); below. */ @@ -6416,7 +6410,7 @@ gethostbyname_r(); ; return 0; } EOF -if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -6436,11 +6430,11 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then EOF echo $ac_n "checking gethostbyname_r with 6 args""... $ac_c" 1>&6 -echo "configure:6440: checking gethostbyname_r with 6 args" >&5 +echo "configure:6434: checking gethostbyname_r with 6 args" >&5 OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" cat > conftest.$ac_ext <<EOF -#line 6444 "configure" +#line 6438 "configure" #include "confdefs.h" # include <netdb.h> @@ -6457,7 +6451,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -6477,9 +6471,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 5 args""... $ac_c" 1>&6 -echo "configure:6481: checking gethostbyname_r with 5 args" >&5 +echo "configure:6475: checking gethostbyname_r with 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 6483 "configure" +#line 6477 "configure" #include "confdefs.h" # include <netdb.h> @@ -6496,7 +6490,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -6516,9 +6510,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 3 args""... $ac_c" 1>&6 -echo "configure:6520: checking gethostbyname_r with 3 args" >&5 +echo "configure:6514: checking gethostbyname_r with 3 args" >&5 cat > conftest.$ac_ext <<EOF -#line 6522 "configure" +#line 6516 "configure" #include "confdefs.h" # include <netdb.h> @@ -6533,7 +6527,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -6569,12 +6563,12 @@ else for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6573: checking for $ac_func" >&5 +echo "configure:6567: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6578 "configure" +#line 6572 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6597,7 +6591,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6635,12 +6629,12 @@ fi # Linux requires this for correct f.p. operations echo $ac_n "checking for __fpu_control""... $ac_c" 1>&6 -echo "configure:6639: checking for __fpu_control" >&5 +echo "configure:6633: checking for __fpu_control" >&5 if eval "test \"`echo '$''{'ac_cv_func___fpu_control'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6644 "configure" +#line 6638 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __fpu_control(); below. */ @@ -6663,7 +6657,7 @@ __fpu_control(); ; return 0; } EOF -if { (eval echo configure:6667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___fpu_control=yes" else @@ -6681,7 +6675,7 @@ if eval "test \"`echo '$ac_cv_func_'__fpu_control`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __fpu_control in -lieee""... $ac_c" 1>&6 -echo "configure:6685: checking for __fpu_control in -lieee" >&5 +echo "configure:6679: checking for __fpu_control in -lieee" >&5 ac_lib_var=`echo ieee'_'__fpu_control | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6689,7 +6683,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <<EOF -#line 6693 "configure" +#line 6687 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6700,7 +6694,7 @@ int main() { __fpu_control() ; return 0; } EOF -if { (eval echo configure:6704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6733,7 +6727,7 @@ fi # Check for --with-fpectl echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6 -echo "configure:6737: checking for --with-fpectl" >&5 +echo "configure:6731: checking for --with-fpectl" >&5 # Check whether --with-fpectl or --without-fpectl was given. if test "${with_fpectl+set}" = set; then withval="$with_fpectl" @@ -6758,7 +6752,7 @@ BeOS) ;; *) LIBM=-lm esac echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6 -echo "configure:6762: checking for --with-libm=STRING" >&5 +echo "configure:6756: checking for --with-libm=STRING" >&5 # Check whether --with-libm or --without-libm was given. if test "${with_libm+set}" = set; then withval="$with_libm" @@ -6779,7 +6773,7 @@ fi # check for --with-libc=... echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6 -echo "configure:6783: checking for --with-libc=STRING" >&5 +echo "configure:6777: checking for --with-libc=STRING" >&5 # Check whether --with-libc or --without-libc was given. if test "${with_libc+set}" = set; then withval="$with_libc" @@ -6803,12 +6797,12 @@ LIBS="$LIBS $LIBM" for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6807: checking for $ac_func" >&5 +echo "configure:6801: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6812 "configure" +#line 6806 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6831,7 +6825,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6861,7 +6855,7 @@ LIBS=$LIBS_SAVE # check whether malloc(0) returns NULL or not echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6 -echo "configure:6865: checking what malloc(0) returns" >&5 +echo "configure:6859: checking what malloc(0) returns" >&5 if eval "test \"`echo '$''{'ac_cv_malloc_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6869,7 +6863,7 @@ else ac_cv_malloc_zero=nonnull else cat > conftest.$ac_ext <<EOF -#line 6873 "configure" +#line 6867 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_STDLIB @@ -6888,7 +6882,7 @@ main() { exit(0); } EOF -if { (eval echo configure:6892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_malloc_zero=nonnull else @@ -6914,17 +6908,17 @@ fi # check for wchar.h ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:6918: checking for wchar.h" >&5 +echo "configure:6912: checking for wchar.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6923 "configure" +#line 6917 "configure" #include "confdefs.h" #include <wchar.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6955,7 +6949,7 @@ fi if test "$wchar_h" = yes then echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:6959: checking size of wchar_t" >&5 +echo "configure:6953: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6963,7 +6957,7 @@ else ac_cv_sizeof_wchar_t=4 else cat > conftest.$ac_ext <<EOF -#line 6967 "configure" +#line 6961 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -6974,7 +6968,7 @@ main() exit(0); } EOF -if { (eval echo configure:6978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_wchar_t=`cat conftestval` else @@ -6996,7 +6990,7 @@ EOF fi echo $ac_n "checking what type to use for unicode""... $ac_c" 1>&6 -echo "configure:7000: checking what type to use for unicode" >&5 +echo "configure:6994: checking what type to use for unicode" >&5 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then enableval="$enable_unicode" @@ -7071,14 +7065,14 @@ fi # check for endianness echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:7075: checking whether byte ordering is bigendian" >&5 +echo "configure:7069: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 7082 "configure" +#line 7076 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -7089,11 +7083,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 7097 "configure" +#line 7091 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -7104,7 +7098,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -7124,7 +7118,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7128 "configure" +#line 7122 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -7137,7 +7131,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -7164,7 +7158,7 @@ fi # Check whether right shifting a negative integer extends the sign bit # or fills with zeros (like the Cray J90, according to Tim Peters). echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6 -echo "configure:7168: checking whether right shift extends the sign bit" >&5 +echo "configure:7162: checking whether right shift extends the sign bit" >&5 if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7173,7 +7167,7 @@ if test "$cross_compiling" = yes; then ac_cv_rshift_extends_sign=yes else cat > conftest.$ac_ext <<EOF -#line 7177 "configure" +#line 7171 "configure" #include "confdefs.h" int main() @@ -7182,7 +7176,7 @@ int main() } EOF -if { (eval echo configure:7186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_rshift_extends_sign=yes else @@ -7207,13 +7201,13 @@ fi # check for getc_unlocked and related locking functions echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6 -echo "configure:7211: checking for getc_unlocked() and friends" >&5 +echo "configure:7205: checking for getc_unlocked() and friends" >&5 if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7217 "configure" +#line 7211 "configure" #include "confdefs.h" #include <stdio.h> int main() { @@ -7225,7 +7219,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_getc_unlocked=yes else @@ -7248,7 +7242,7 @@ fi # check for readline 4.0 echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6 -echo "configure:7252: checking for rl_pre_input_hook in -lreadline" >&5 +echo "configure:7246: checking for rl_pre_input_hook in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_pre_input_hook | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7256,7 +7250,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7260 "configure" +#line 7254 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7267,7 +7261,7 @@ int main() { rl_pre_input_hook() ; return 0; } EOF -if { (eval echo configure:7271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7293,7 +7287,7 @@ fi # check for readline 4.2 echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6 -echo "configure:7297: checking for rl_completion_matches in -lreadline" >&5 +echo "configure:7291: checking for rl_completion_matches in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7301,7 +7295,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7305 "configure" +#line 7299 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7312,7 +7306,7 @@ int main() { rl_completion_matches() ; return 0; } EOF -if { (eval echo configure:7316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7337,7 +7331,7 @@ fi echo $ac_n "checking for broken nice()""... $ac_c" 1>&6 -echo "configure:7341: checking for broken nice()" >&5 +echo "configure:7335: checking for broken nice()" >&5 if eval "test \"`echo '$''{'ac_cv_broken_nice'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7346,7 +7340,7 @@ if test "$cross_compiling" = yes; then ac_cv_broken_nice=no else cat > conftest.$ac_ext <<EOF -#line 7350 "configure" +#line 7344 "configure" #include "confdefs.h" int main() @@ -7358,7 +7352,7 @@ int main() } EOF -if { (eval echo configure:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_broken_nice=yes else @@ -7383,12 +7377,12 @@ fi # On HP/UX 11.0, mvwdelch is a block with a return statement echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6 -echo "configure:7387: checking whether mvwdelch is an expression" >&5 +echo "configure:7381: checking whether mvwdelch is an expression" >&5 if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7392 "configure" +#line 7386 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7398,7 +7392,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mvwdelch_is_expression=yes else @@ -7421,12 +7415,12 @@ EOF fi echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6 -echo "configure:7425: checking whether WINDOW has _flags" >&5 +echo "configure:7419: checking whether WINDOW has _flags" >&5 if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7430 "configure" +#line 7424 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7436,7 +7430,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_window_has_flags=yes else @@ -7467,12 +7461,12 @@ cat >> confdefs.h <<\EOF #endif EOF echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:7471: checking for socklen_t" >&5 +echo "configure:7465: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7476 "configure" +#line 7470 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -7521,7 +7515,7 @@ done SRCDIRS="Parser Grammar Objects Python Modules" echo $ac_n "checking for build directories""... $ac_c" 1>&6 -echo "configure:7525: checking for build directories" >&5 +echo "configure:7519: checking for build directories" >&5 for dir in $SRCDIRS; do if test ! -d $dir; then mkdir $dir diff --git a/configure.in b/configure.in index 68d352e..349042b 100644 --- a/configure.in +++ b/configure.in @@ -1189,8 +1189,7 @@ if test "$ipv6" = "yes"; then #ifdef IPV6_INRIA_VERSION yes #endif], - [ipv6type=$i; - OPT="-DINET6 $OPT"]) + [ipv6type=$i]) ;; kame) dnl http://www.kame.net/ @@ -1202,8 +1201,7 @@ yes [ipv6type=$i; ipv6lib=inet6 ipv6libdir=/usr/local/v6/lib - ipv6trylibc=yes - OPT="-DINET6 $OPT"]) + ipv6trylibc=yes]) ;; linux-glibc) dnl http://www.v6.linux.or.jp/ @@ -1213,8 +1211,7 @@ yes yes #endif], [ipv6type=$i; - ipv6trylibc=yes - OPT="-DINET6 $OPT"]) + ipv6trylibc=yes]) ;; linux-inet6) dnl http://www.v6.linux.or.jp/ @@ -1222,7 +1219,7 @@ yes ipv6type=$i ipv6lib=inet6 ipv6libdir=/usr/inet6/lib - OPT="-DINET6 -I/usr/inet6/include $OPT" + OPT="-I/usr/inet6/include $OPT" fi ;; solaris) @@ -1230,7 +1227,6 @@ yes if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then ipv6type=$i ipv6trylibc=yes - OPT="-DINET6 $OPT" fi fi ;; @@ -1242,8 +1238,7 @@ yes #endif], [ipv6type=$i; ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - OPT="-DINET6 $OPT"]) + ipv6libdir=/usr/local/v6/lib]) ;; v6d) AC_EGREP_CPP(yes, [ @@ -1264,8 +1259,7 @@ yes #endif], [ipv6type=$i; ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - OPT="-DINET6 $OPT"]) + ipv6libdir=/usr/local/v6/lib]) ;; esac if test "$ipv6type" != "unknown"; then |