Add IP probe for ip_mreq

Backport 2f1eb816b5cba6977b1a8159

19 files changed, 54 insertions, 5 deletions

diff --git a/Configure b/Configure
index 3ae16ca407..72a7c25e9c 100755
--- a/Configure
+++ b/Configure
@@ -28,7 +28,7 @@
 # See Porting/pumpkin.pod for more information on metaconfig.
 #
 
-# Generated on Sun Apr  1 12:00:35 CEST 2012 [metaconfig 3.5 PL0]
+# Generated on Wed Jul 11 16:58:32 CEST 2012 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -723,6 +723,7 @@ d_snprintf=''
 d_vsnprintf=''
 d_sockatmark=''
 d_sockatmarkproto=''
+d_ip_mreq=''
 d_ipv6_mreq=''
 d_msg_ctrunc=''
 d_msg_dontroute=''
@@ -11371,6 +11372,24 @@ set d_sin6_scope_id; eval $setvar
 $rm_try
 
 echo " "
+echo "Checking the availability struct ip_mreq ..." >&4
+$cat >try.c <<EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int main() {
+struct ip_mreq mreq;
+return (mreq.imr_multiaddr.s_addr);
+}
+EOF
+val="$undef"
+set try; if eval $compile; then
+       val="$define"
+fi
+set d_ip_mreq; eval $setvar
+$rm_try
+
+echo " "
 echo "Checking the availability struct ipv6_mreq ..." >&4
 $cat >try.c <<EOF
 #include <sys/types.h>
@@ -23023,6 +23042,7 @@ d_inetaton='$d_inetaton'
 d_inetntop='$d_inetntop'
 d_inetpton='$d_inetpton'
 d_int64_t='$d_int64_t'
+d_ip_mreq='$d_ip_mreq'
 d_ipv6_mreq='$d_ipv6_mreq'
 d_isascii='$d_isascii'
 d_isblank='$d_isblank'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 7132ea2e12..80f4e4a431 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -284,6 +284,7 @@ d_inetaton='define'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='define'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 84004bd7e3..dfa56aacc1 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -273,6 +273,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/Porting/Glossary b/Porting/Glossary
index 23ffbfe235..f24a249062 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1271,6 +1271,10 @@ d_inetpton (d_inetpton.U):
 d_int64_t (d_int64_t.U):
 	This symbol will be defined if the C compiler supports int64_t.
 
+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_ipv6_mreq (d_socket.U):
 	This variable conditionally defines the HAS_IPV6_MREQ symbol, which
 	indicates the availability of a struct ipv6_mreq.
diff --git a/Porting/config.sh b/Porting/config.sh
index 0956507b41..3a8a4aab4b 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -298,6 +298,7 @@ d_inetaton='define'
 d_inetntop='define'
 d_inetpton='define'
 d_int64_t='define'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/config_h.SH b/config_h.SH
index 5b9d3f8606..469ed4ecb7 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -995,7 +995,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #define BIN "$bin"	/**/
 #define BIN_EXP "$binexp"	/**/
-#$userelocatableinc PERL_RELOCATABLE_INC  		/**/
+#define PERL_RELOCATABLE_INC "$userelocatableinc" 		/**/
 
 /* INTSIZE:
  *	This symbol contains the value of sizeof(int) so that the C
@@ -2392,6 +2392,10 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	This symbol, if defined, indicates that the struct sockaddr_in6
  *	structure has a member called sin6_scope_id.
  */
+/* HAS_IP_MREQ:
+ *	This symbol, if defined, indicates the availability of
+ *	struct ip_mreq;
+ */
 /* HAS_IPV6_MREQ:
  *	This symbol, if defined, indicates the availability of
  *	struct ipv6_mreq;
@@ -2407,6 +2411,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$d_scm_rights	HAS_SCM_RIGHTS	/**/
 #$d_sockaddr_in6	HAS_SOCKADDR_IN6	/**/
 #$d_sin6_scope_id	HAS_SIN6_SCOPE_ID	/**/
+#$d_ip_mreq	HAS_IP_MREQ	/**/
 #$d_ipv6_mreq	HAS_IPV6_MREQ	/**/
 
 /* HAS_SRAND48_R:
diff --git a/configure.com b/configure.com
index 075cebd534..33e225960f 100644
--- a/configure.com
+++ b/configure.com
@@ -6076,6 +6076,7 @@ $ WC "d_inetaton='undef'"
 $ WC "d_inetntop='undef'"
 $ WC "d_inetpton='undef'"
 $ WC "d_int64_t='" + d_int64_t + "'"
+$ WC "d_ip_mreq='define'"
 $ WC "d_ipv6_mreq='define'"
 $ WC "d_isascii='define'"
 $ WC "d_isblank='undef'"
diff --git a/epoc/config.sh b/epoc/config.sh
index 3eb92a0eb4..1b32709015 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -279,6 +279,7 @@ d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
 d_iovec_s='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/metaconfig.h b/metaconfig.h
index 7fb867edeb..0038993567 100644
--- a/metaconfig.h
+++ b/metaconfig.h
@@ -17,6 +17,7 @@
  * HAS_GMTIME64
  * HAS_ISBLANK
  * HAS_LOCALTIME64
+ * HAS_IP_MREQ
  * HAS_IPV6_MREQ
  * HAS_MKTIME64
  * HAS_PRCTL
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index bb3f3e992c..4c3c37d5eb 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -284,6 +284,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='define'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='undef'
 d_isblank='undef'
diff --git a/symbian/config.sh b/symbian/config.sh
index 010a686af7..63f43af3d3 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -230,6 +230,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='undef'
 d_isblank='undef'
diff --git a/uconfig.h b/uconfig.h
index 82b3c25a7e..967ba2c2d4 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -962,7 +962,7 @@
  */
 #define BIN "/usr/local/bin"	/**/
 #define BIN_EXP "/usr/local/bin"	/**/
-/*#define PERL_RELOCATABLE_INC  		/ **/
+#define PERL_RELOCATABLE_INC "undef" 		/**/
 
 /* INTSIZE:
  *	This symbol contains the value of sizeof(int) so that the C
@@ -2359,6 +2359,10 @@
  *	This symbol, if defined, indicates that the struct sockaddr_in6
  *	structure has a member called sin6_scope_id.
  */
+/* HAS_IP_MREQ:
+ *	This symbol, if defined, indicates the availability of
+ *	struct ip_mreq;
+ */
 /* HAS_IPV6_MREQ:
  *	This symbol, if defined, indicates the availability of
  *	struct ipv6_mreq;
@@ -2374,6 +2378,7 @@
 /*#define	HAS_SCM_RIGHTS	/ **/
 /*#define	HAS_SOCKADDR_IN6	/ **/
 /*#define	HAS_SIN6_SCOPE_ID	/ **/
+/*#define	HAS_IP_MREQ	/ **/
 /*#define	HAS_IPV6_MREQ	/ **/
 
 /* HAS_SRAND48_R:
@@ -4734,6 +4739,6 @@
 #endif
 
 /* Generated from:
- * d9b6a68b192c72c0695b560fae6e4916b381f55df5fdf7911b0ef434840f092e config_h.SH
- * 573628443b0f7d922ef2706de7e05f3d5ff794bcb6708b68ddcecd0e2d30e7bd uconfig.sh
+ * 450f87b8e0de509bd7e72485185b4060363119bedef2b8aff868354f42708a78 config_h.SH
+ * e3a05060ae46f0ca7ea3a4fd9a4c2dcd60caf070529116479a74830d923d1ca3 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 4d0645e29c..5bf05752d8 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -223,6 +223,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='undef'
 d_isblank='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index ad773e71af..96e0fd3c5d 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -224,6 +224,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='undef'
 d_isblank='undef'
diff --git a/win32/config.ce b/win32/config.ce
index 6ba1650a27..4df8e6e911 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -271,6 +271,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 2bb67bb134..fd901e6d17 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -271,6 +271,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/win32/config.gc64 b/win32/config.gc64
index d5a2e024b7..5fff237c0a 100644
--- a/win32/config.gc64
+++ b/win32/config.gc64
@@ -271,6 +271,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/win32/config.vc b/win32/config.vc
index eda2071d19..47a7f6291e 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -271,6 +271,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'
diff --git a/win32/config.vc64 b/win32/config.vc64
index 3cc7c93447..8d45e8859e 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -271,6 +271,7 @@ d_inetaton='undef'
 d_inetntop='undef'
 d_inetpton='undef'
 d_int64_t='undef'
+d_ip_mreq='undef'
 d_ipv6_mreq='undef'
 d_isascii='define'
 d_isblank='undef'