2186. [port] cygwin: libbind: check for struct sockaddr_storage

                        independently of IPv6. [RT #16482]

diff --git a/CHANGES b/CHANGES
index 423e89a8c997240009fa2babcdbb381db6f4833d..b3c159562d456f6e01cbd9a3f2e554d389d664a2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2186.  [port]          cygwin: libbind: check for struct sockaddr_storage
+                       independently of IPv6. [RT #16482]
+
 2185.  [port]          sunos: libbind: check for ssize_t, memmove() and
                        memchr(). [RT #16463]
 

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index cbb8cbdbaa506025bb29a20769f8d8a4e1ec9ea6..63c26af172addea3c1e233f8cc69f6f73204638e 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.126 $)
+AC_REVISION($Revision: 1.127 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -882,27 +882,12 @@ $isc_netinet6in6_hack
                         ISC_PLATFORM_HAVEIN6PKTINFO="#define ISC_PLATFORM_HAVEIN6PKTINFO 1"],
                        [AC_MSG_RESULT(no -- disabling runtime ipv6 support)
                         ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO"])
-
-               AC_MSG_CHECKING(for sockaddr_storage)
-               AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-$isc_netinetin6_hack
-$isc_netinet6in6_hack
-],
-               [struct sockaddr_storage xyzzy; return (0);],
-                       [AC_MSG_RESULT(yes)
-                        HAVE_SOCKADDR_STORAGE="#define HAVE_SOCKADDR_STORAGE 1"],
-                       [AC_MSG_RESULT(no)
-                        HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE"])
                ;;
        no)
                HAS_INET6_STRUCTS="#undef HAS_INET6_STRUCTS"
                NEED_IN6ADDR_ANY="#undef NEED_IN6ADDR_ANY"
                ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO"
                HAVE_SIN6_SCOPE_ID="#define HAVE_SIN6_SCOPE_ID 1"
-               HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE"
                ISC_IPV6_H="ipv6.h"
                ISC_IPV6_O="ipv6.$O"
                ISC_ISCIPV6_O="unix/ipv6.$O"
@@ -910,6 +895,18 @@ $isc_netinet6in6_hack
                ;;
 esac
 
+AC_MSG_CHECKING(for sockaddr_storage)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+],
+[struct sockaddr_storage xyzzy; return (0);],
+       [AC_MSG_RESULT(yes)
+        HAVE_SOCKADDR_STORAGE="#define HAVE_SOCKADDR_STORAGE 1"],
+       [AC_MSG_RESULT(no)
+        HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE"])
+
 AC_SUBST(HAS_INET6_STRUCTS)
 AC_SUBST(ISC_PLATFORM_NEEDNETINETIN6H)
 AC_SUBST(ISC_PLATFORM_NEEDNETINET6IN6H)