Index: configure
===================================================================
--- configure	(revision 30480)
+++ configure	(working copy)
@@ -687,6 +689,9 @@
 _struct_addrinfo=auto
 _getaddrinfo=auto
 _struct_sockaddr_storage=auto
+_struct_ipv6_mreq=auto
+_struct_sockaddr_in6=auto
+_struct_sockaddr_sa_len=auto
 _smb=auto
 _vidix=auto
 _vidix_pcidb=yes
@@ -3212,6 +3219,73 @@
 fi


+echocheck "struct ipv6_mreq"
+if test "$_struct_ipv6_mreq" = auto; then
+  _struct_ipv6_mreq=no
+  cat > $TMPC << EOF
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#include <netinet/in.h>
+#endif
+int main(void) { struct ipv6_mreq mreq6; return 0; }
+EOF
+  cc_check $cc_check_winsock2_h && _struct_ipv6_mreq=yes
+fi
+echores "$_struct_ipv6_mreq"
+
+if test "$_struct_ipv6_mreq" = yes; then
+  def_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 1"
+else
+  def_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 0"
+fi
+
+
+echocheck "struct sockaddr_in6"
+if test "$_struct_sockaddr_in6" = auto; then
+  _struct_sockaddr_in6=no
+  cat > $TMPC << EOF
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#include <netinet/in.h>
+#endif
+int main(void) { struct sockaddr_in6 addr; return 0; }
+EOF
+  cc_check $cc_check_winsock2_h && _struct_sockaddr_in6=yes
+fi
+echores "$_struct_sockaddr_in6"
+
+if test "$_struct_sockaddr_in6" = yes; then
+  def_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 1"
+else
+  def_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 0"
+fi
+
+
+echocheck "struct sockaddr sa_len"
+if test "$_struct_sockaddr_sa_len" = auto; then
+  _struct_sockaddr_sa_len=no
+  cat > $TMPC << EOF
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+int main(void) { const void *p = &((struct sockaddr *)0)->sa_len; return 0; }
+EOF
+  cc_check $cc_check_winsock2_h && _struct_sockaddr_sa_len=yes
+fi
+echores "$_struct_sockaddr_sa_len"
+
+if test "$_struct_sockaddr_sa_len" = yes; then
+  def_sockaddr_sa_len="#define HAVE_STRUCT_SOCKADDR_SA_LEN 1"
+else
+  def_sockaddr_sa_len="#define HAVE_STRUCT_SOCKADDR_SA_LEN 0"
+fi
+
+
 echocheck "arpa/inet.h"
 arpa_inet_h=no
 def_arpa_inet_h='#define HAVE_ARPA_INET_H 0'
@@ -9034,6 +9130,9 @@
 $def_addrinfo
 $def_getaddrinfo
 $def_sockaddr_storage
+$def_ipv6_mreq
+$def_sockaddr_in6
+$def_sockaddr_sa_len


 /* libvo options */
@@ -9179,8 +9278,6 @@
 #define HAVE_POLL_H 1
 #define HAVE_PPC4XX 0
 #define HAVE_SETMODE 0
-#define HAVE_STRUCT_IPV6_MREQ 1
-#define HAVE_STRUCT_SOCKADDR_IN6 1
 #define HAVE_SYS_SELECT_H 0
 #define HAVE_VFP_ARGS 1
 #define HAVE_VIRTUALALLOC 0