Module: wine Branch: master Commit: fd05f5412f25e9e55f42d4a516391b4de47e970f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd05f5412f25e9e55f42d4a516...
Author: Charles Davis cdavis5x@gmail.com Date: Tue Sep 11 09:11:30 2012 -0600
configure: Fix ipstat tests to work on Mac OS.
---
configure | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 10 deletions(-)
diff --git a/configure b/configure index 48d854b..97e4664 100755 --- a/configure +++ b/configure @@ -14199,7 +14199,16 @@ _ACEOF fi
-ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_NETINET_ICMP_VAR +ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif " @@ -14243,7 +14252,7 @@ ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_outhist" "ac_cv_member_st #ifdef HAVE_NETINET_IP_ICMP_H #include <netinet/ip_icmp.h> #endif -#ifdef HAVE_NETINET_ICMP_VAR +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif " @@ -14257,7 +14266,16 @@ _ACEOF fi
-ac_fn_c_check_member "$LINENO" "struct ipstat" "ips_total" "ac_cv_member_struct_ipstat_ips_total" "#ifdef HAVE_NETINET_IP_VAR_H +ac_fn_c_check_member "$LINENO" "struct ipstat" "ips_total" "ac_cv_member_struct_ipstat_ips_total" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif " @@ -14285,7 +14303,19 @@ _ACEOF fi
-ac_fn_c_check_member "$LINENO" "struct tcpstat" "tcps_connattempt" "ac_cv_member_struct_tcpstat_tcps_connattempt" "#ifdef HAVE_NETINET_TCP_VAR_H +ac_fn_c_check_member "$LINENO" "struct tcpstat" "tcps_connattempt" "ac_cv_member_struct_tcpstat_tcps_connattempt" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif +#ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif " @@ -14313,7 +14343,19 @@ _ACEOF fi
-ac_fn_c_check_member "$LINENO" "struct udpstat" "udps_ipackets" "ac_cv_member_struct_udpstat_udps_ipackets" "#ifdef HAVE_NETINET_UDP_VAR_H +ac_fn_c_check_member "$LINENO" "struct udpstat" "udps_ipackets" "ac_cv_member_struct_udpstat_udps_ipackets" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_UDP_H +#include <netinet/udp.h> +#endif +#ifdef HAVE_NETINET_UDP_VAR_H #include <netinet/udp_var.h> #endif " diff --git a/configure.ac b/configure.ac index 9a15200..7e761af 100644 --- a/configure.ac +++ b/configure.ac @@ -2311,7 +2311,16 @@ AC_CHECK_MEMBERS([ns_msg._msg_ptr],,,
dnl Check for struct icmpstat AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, -[#ifdef HAVE_NETINET_ICMP_VAR +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif])
@@ -2347,13 +2356,22 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #ifdef HAVE_NETINET_IP_ICMP_H #include <netinet/ip_icmp.h> #endif -#ifdef HAVE_NETINET_ICMP_VAR +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif])
dnl Check for struct ipstat AC_CHECK_MEMBERS([struct ipstat.ips_total],,, -[#ifdef HAVE_NETINET_IP_VAR_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif])
@@ -2365,7 +2383,19 @@ AC_CHECK_MEMBERS([struct ip_stats.ips_total],,,
dnl Check for struct tcpstat AC_CHECK_MEMBERS([struct tcpstat.tcps_connattempt],,, -[#ifdef HAVE_NETINET_TCP_VAR_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif +#ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif])
@@ -2377,7 +2407,19 @@ AC_CHECK_MEMBERS([struct tcp_stats.tcps_connattempt],,,
dnl Check for struct udpstat AC_CHECK_MEMBERS([struct udpstat.udps_ipackets],,, -[#ifdef HAVE_NETINET_UDP_VAR_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_UDP_H +#include <netinet/udp.h> +#endif +#ifdef HAVE_NETINET_UDP_VAR_H #include <netinet/udp_var.h> #endif])