summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-11-01 01:47:19 +0000
committerBenjamin Peterson <benjamin@python.org>2010-11-01 01:47:19 +0000
commit75fed81c756df510f8db24cac7fb2fcbcfea60cd (patch)
treecd7cf9cbf8c13a23e81bf61cd710cbdd2bbbd9fa
parent48d1928b7299712458c8070a4ba4af2bd9cb5720 (diff)
downloadcpython-git-75fed81c756df510f8db24cac7fb2fcbcfea60cd.tar.gz
Merged revisions 86075 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86075 | benjamin.peterson | 2010-10-31 20:44:30 -0500 (Sun, 31 Oct 2010) | 1 line fix output for getaddrinfo bug check #7059 ........
-rwxr-xr-xconfigure6
-rw-r--r--configure.in3
2 files changed, 8 insertions, 1 deletions
diff --git a/configure b/configure
index 0440545409..69adabb1ce 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 85556 .
+# From configure.in Revision: 86043 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7.
#
@@ -10799,6 +10799,9 @@ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
+$as_echo "$ac_cv_buggy_getaddrinfo" >&6; }
+
if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
then
if test $ipv6 = yes
@@ -10812,6 +10815,7 @@ else
$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
fi
+
for ac_func in getnameinfo
do :
ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
diff --git a/configure.in b/configure.in
index 8f828de2f4..a499a9b971 100644
--- a/configure.in
+++ b/configure.in
@@ -3109,6 +3109,8 @@ int main()
[ac_cv_buggy_getaddrinfo=yes]))
fi
+AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+
if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
then
if test $ipv6 = yes
@@ -3120,6 +3122,7 @@ then
else
AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if you have the getaddrinfo function.])
fi
+
AC_CHECK_FUNCS(getnameinfo)
# checks for structures