Backport checkin>

Bug #934635: Fixed a bug where the configure script couldn't detect
getaddrinfo() properly if the KAME stack had SCTP support.
(Submitted by SUZUKI Shinsuke)

diff --git a/Misc/NEWS b/Misc/NEWS
index 7d6297c0ee6b8422789707f09e875ed0658123d2..6d4d407c3b36c0fb7174b693ba05cc8d1931345c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -160,6 +160,12 @@ Library
 
 - Bug #823328: urllib2's HTTP Digest Auth support works again.
 
+Build
+-----
+
+- Bug #934635: Fixed a bug where the configure script couldn't detect
+  getaddrinfo() properly if the KAME stack had SCTP support.
+
 What's New in Python 2.3.2 (final)?
 ===================================
 

diff --git a/configure b/configure
index 6b07079d7c7d67654459db36ad56a83cd31949f9..59a463fd1ce309bb502e3efc35ed15289f2c465d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.427.4.10 .
+# From configure.in Revision: 1.427.4.11 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for python 2.3.
 #
@@ -15001,6 +15001,7 @@ main()
     hints.ai_family = AF_UNSPEC;
     hints.ai_flags = passive ? AI_PASSIVE : 0;
     hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
       (void)gai_strerror(gaierr);
       goto bad;

diff --git a/configure.in b/configure.in
index 67c715ea4d1544b47db99a5ed224bfe9db30983c..77aa5897fbc2244dafa705ca06a6e27b7a22437c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2298,6 +2298,7 @@ main()
     hints.ai_family = AF_UNSPEC;
     hints.ai_flags = passive ? AI_PASSIVE : 0;
     hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
       (void)gai_strerror(gaierr);
       goto bad;