17 files changed, 97 insertions, 3 deletions

diff --git a/Configure b/Configure
index c88d99c9c5..a1ba981550 100755
--- a/Configure
+++ b/Configure
@@ -28,7 +28,7 @@
 # See Porting/pumpkin.pod for more information on metaconfig.
 #
 
-# Generated on Wed Jul 11 16:58:32 CEST 2012 [metaconfig 3.5 PL0]
+# Generated on Sun Aug 26 14:33:39 CEST 2012 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -724,7 +724,9 @@ d_vsnprintf=''
 d_sockatmark=''
 d_sockatmarkproto=''
 d_ip_mreq=''
+d_ip_mreq_source=''
 d_ipv6_mreq=''
+d_ipv6_mreq_source=''
 d_msg_ctrunc=''
 d_msg_dontroute=''
 d_msg_oob=''
@@ -11390,6 +11392,24 @@ set d_ip_mreq; eval $setvar
 $rm_try
 
 echo " "
+echo "Checking the availability struct ip_mreq_source ..." >&4
+$cat >try.c <<EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int main() {
+struct ip_mreq_source mreq;
+return (mreq.imr_multiaddr.s_addr);
+}
+EOF
+val="$undef"
+set try; if eval $compile; then
+       val="$define"
+fi
+set d_ip_mreq_source; eval $setvar
+$rm_try
+
+echo " "
 echo "Checking the availability struct ipv6_mreq ..." >&4
 $cat >try.c <<EOF
 #include <sys/types.h>
@@ -11408,6 +11428,24 @@ set d_ipv6_mreq; eval $setvar
 $rm_try
 
 echo " "
+echo "Checking the availability struct ipv6_mreq_source ..." >&4
+$cat >try.c <<EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int main() {
+struct ipv6_mreq_source mreq;
+return (mreq.imr_multiaddr.s_addr);
+}
+EOF
+val="$undef"
+set try; if eval $compile; then
+       val="$define"
+fi
+set d_ipv6_mreq_source; eval $setvar
+$rm_try
+
+echo " "
 echo "Checking the availability of certain socket constants..." >&4
 for ENUM in MSG_CTRUNC MSG_DONTROUTE MSG_OOB MSG_PEEK MSG_PROXY SCM_RIGHTS; do
 	enum=`$echo $ENUM|./tr '[A-Z]' '[a-z]'`
@@ -23043,7 +23081,9 @@ d_inetntop='$d_inetntop'
 d_inetpton='$d_inetpton'
 d_int64_t='$d_int64_t'
 d_ip_mreq='$d_ip_mreq'
+d_ip_mreq_source='$d_ip_mreq_source'
 d_ipv6_mreq='$d_ipv6_mreq'
+d_ipv6_mreq_source='$d_ipv6_mreq_source'
 d_isascii='$d_isascii'
 d_isblank='$d_isblank'
 d_isfinite='$d_isfinite'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 7095ddc033..803c9b5187 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -285,7 +285,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='define'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index dfa56aacc1..b3da4a65f3 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -274,7 +274,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/Porting/Glossary b/Porting/Glossary
index f24a249062..68312a391d 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1275,10 +1275,18 @@ d_ip_mreq (d_socket.U):
 	This variable conditionally defines the HAS_IP_MREQ symbol, which
 	indicates the availability of a struct ip_mreq.
 
+d_ip_mreq_source (d_socket.U):
+	This variable conditionally defines the HAS_IP_MREQ_SOURCE symbol,
+	which indicates the availability of a struct ip_mreq_source.
+
 d_ipv6_mreq (d_socket.U):
 	This variable conditionally defines the HAS_IPV6_MREQ symbol, which
 	indicates the availability of a struct ipv6_mreq.
 
+d_ipv6_mreq_source (d_socket.U):
+	This variable conditionally defines the HAS_IPV6_MREQ_SOURCE symbol,
+	which indicates the availability of a struct ipv6_mreq_source.
+
 d_isascii (d_isascii.U):
 	This variable conditionally defines the HAS_ISASCII constant,
 	which indicates to the C program that isascii() is available.
diff --git a/Porting/config.sh b/Porting/config.sh
index 5943406acb..ad3512a038 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -299,7 +299,9 @@ d_inetntop='define'
 d_inetpton='define'
 d_int64_t='define'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/config_h.SH b/config_h.SH
index 469ed4ecb7..988273f3ba 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -2396,10 +2396,18 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	This symbol, if defined, indicates the availability of
  *	struct ip_mreq;
  */
+/* HAS_IP_MREQ_SOURCE:
+ *	This symbol, if defined, indicates the availability of
+ *	struct ip_mreq_source;
+ */
 /* HAS_IPV6_MREQ:
  *	This symbol, if defined, indicates the availability of
  *	struct ipv6_mreq;
  */
+/* HAS_IPV6_MREQ_SOURCE:
+ *	This symbol, if defined, indicates the availability of
+ *	struct ipv6_mreq_source;
+ */
 #$d_socket	HAS_SOCKET		/**/
 #$d_sockpair	HAS_SOCKETPAIR	/**/
 #$d_sockaddr_sa_len	HAS_SOCKADDR_SA_LEN	/**/
@@ -2412,7 +2420,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$d_sockaddr_in6	HAS_SOCKADDR_IN6	/**/
 #$d_sin6_scope_id	HAS_SIN6_SCOPE_ID	/**/
 #$d_ip_mreq	HAS_IP_MREQ	/**/
+#$d_ip_mreq_source	HAS_IP_MREQ_SOURCE	/**/
 #$d_ipv6_mreq	HAS_IPV6_MREQ	/**/
+#$d_ipv6_mreq_source	HAS_IPV6_MREQ_SOURCE	/**/
 
 /* HAS_SRAND48_R:
  *	This symbol, if defined, indicates that the srand48_r routine
diff --git a/configure.com b/configure.com
index 33e225960f..ea8870c582 100644
--- a/configure.com
+++ b/configure.com
@@ -6077,7 +6077,9 @@ $ WC "d_inetntop='undef'"
 $ WC "d_inetpton='undef'"
 $ WC "d_int64_t='" + d_int64_t + "'"
 $ WC "d_ip_mreq='define'"
+$ WC "d_ip_mreq_source='undef'"
 $ WC "d_ipv6_mreq='define'"
+$ WC "d_ipv6_mreq_source='undef'"
 $ WC "d_isascii='define'"
 $ WC "d_isblank='undef'"
 $ WC "d_isfinite='undef'"
diff --git a/epoc/config.sh b/epoc/config.sh
index 112e9870a9..5e17ffc958 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -280,7 +280,9 @@ d_inetpton='undef'
 d_int64_t='undef'
 d_iovec_s='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/metaconfig.h b/metaconfig.h
index 0038993567..9813c2e29a 100644
--- a/metaconfig.h
+++ b/metaconfig.h
@@ -18,7 +18,9 @@
  * HAS_ISBLANK
  * HAS_LOCALTIME64
  * HAS_IP_MREQ
+ * HAS_IP_MREQ_SOURCE
  * HAS_IPV6_MREQ
+ * HAS_IPV6_MREQ_SOURCE
  * HAS_MKTIME64
  * HAS_PRCTL
  * HAS_PSEUDOFORK
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 8fc9beeffd..5969fc2f0a 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -285,7 +285,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='define'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='undef'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/symbian/config.sh b/symbian/config.sh
index 63f43af3d3..d9a4c06562 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -231,7 +231,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='undef'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/uconfig.h b/uconfig.h
index f21c9bd2ed..ddae7cadd4 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -2363,10 +2363,18 @@
  *	This symbol, if defined, indicates the availability of
  *	struct ip_mreq;
  */
+/* HAS_IP_MREQ_SOURCE:
+ *	This symbol, if defined, indicates the availability of
+ *	struct ip_mreq_source;
+ */
 /* HAS_IPV6_MREQ:
  *	This symbol, if defined, indicates the availability of
  *	struct ipv6_mreq;
  */
+/* HAS_IPV6_MREQ_SOURCE:
+ *	This symbol, if defined, indicates the availability of
+ *	struct ipv6_mreq_source;
+ */
 /*#define	HAS_SOCKET		/ **/
 /*#define	HAS_SOCKETPAIR	/ **/
 /*#define	HAS_SOCKADDR_SA_LEN	/ **/
@@ -2379,7 +2387,9 @@
 /*#define	HAS_SOCKADDR_IN6	/ **/
 /*#define	HAS_SIN6_SCOPE_ID	/ **/
 /*#define	HAS_IP_MREQ	/ **/
+/*#define	HAS_IP_MREQ_SOURCE	/ **/
 /*#define	HAS_IPV6_MREQ	/ **/
+/*#define	HAS_IPV6_MREQ_SOURCE	/ **/
 
 /* HAS_SRAND48_R:
  *	This symbol, if defined, indicates that the srand48_r routine
@@ -4739,6 +4749,6 @@
 #endif
 
 /* Generated from:
- * 450f87b8e0de509bd7e72485185b4060363119bedef2b8aff868354f42708a78 config_h.SH
- * 136e00f109103fdebadeec53d77fbc8f8c1bf3eb82ce970c966f362584f4b7f2 uconfig.sh
+ * 55f6d0595668c028fe4021a469971587307b23080241f008057ee1aba71a73c9 config_h.SH
+ * 0b6320512dbf7572c05acf6d6add343230d232f287d02f6d32a7a32edadd97b9 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 32f6aa5de2..d23c0daa25 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -224,7 +224,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='undef'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index 3d3ca5a1d8..1efdde5b77 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -225,7 +225,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='undef'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/win32/config.ce b/win32/config.ce
index 4df8e6e911..39ec1f4629 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -272,7 +272,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 7a7a7ffda4..c51d30a921 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -272,7 +272,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 47a7f6291e..0e975fd27c 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -272,7 +272,9 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_ip_mreq='undef'
+d_ip_mreq_source='undef'
 d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
 d_isascii='define'
 d_isblank='undef'
 d_isfinite='undef'