From: Hye-Shik Chang <hyeshik@gmail.com>
Date: Wed, 14 Apr 2004 08:11:31 +0000 (+0000)
Subject: Backport checkin>
X-Git-Tag: v2.3.4c1~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c4a408031041aeac75149cb242ed1113e02e264;p=thirdparty%2FPython%2Fcpython.git

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 7d6297c0ee6b..6d4d407c3b36 100644
--- 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 6b07079d7c7d..59a463fd1ce3 100755
--- 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 67c715ea4d15..77aa5897fbc2 100644
--- 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;