| diff -aruN iperf-2.0.5/configure iperf-2.0.5.N/configure |
| --- iperf-2.0.5/configure 2010-04-10 12:23:05.000000000 -0700 |
| +++ iperf-2.0.5.N/configure 2015-04-07 12:21:45.087517553 -0700 |
| @@ -7247,7 +7247,7 @@ |
| |
| |
| if test "$ac_cv_multicast" != no; then |
| - ac_fn_c_check_type "$LINENO" "struct ip_mreq" "ac_cv_type_struct_ip_mreq" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_type "$LINENO" "struct ip_mreq" "ac_cv_type_struct_ip_mreq" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_type_struct_ip_mreq" = x""yes; then : |
| |
| @@ -7258,7 +7258,7 @@ |
| |
| fi |
| |
| - ac_fn_c_check_decl "$LINENO" "IP_ADD_MEMBERSHIP" "ac_cv_have_decl_IP_ADD_MEMBERSHIP" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_decl "$LINENO" "IP_ADD_MEMBERSHIP" "ac_cv_have_decl_IP_ADD_MEMBERSHIP" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = x""yes; then : |
| ac_have_decl=1 |
| @@ -7288,7 +7288,7 @@ |
| fi |
| |
| if test "$ac_cv_have_ipv6" != no; then |
| - ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then : |
| |
| @@ -7299,7 +7299,7 @@ |
| |
| fi |
| |
| - ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then : |
| |
| @@ -7310,7 +7310,7 @@ |
| |
| fi |
| |
| - ac_fn_c_check_decl "$LINENO" "AF_INET6" "ac_cv_have_decl_AF_INET6" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_decl "$LINENO" "AF_INET6" "ac_cv_have_decl_AF_INET6" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_have_decl_AF_INET6" = x""yes; then : |
| ac_have_decl=1 |
| @@ -7341,7 +7341,7 @@ |
| |
| if test "$ac_cv_have_ipv6" = yes; then |
| if test "$ac_cv_multicast" = yes; then |
| - ac_fn_c_check_type "$LINENO" "struct ipv6_mreq" "ac_cv_type_struct_ipv6_mreq" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_type "$LINENO" "struct ipv6_mreq" "ac_cv_type_struct_ipv6_mreq" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_type_struct_ipv6_mreq" = x""yes; then : |
| |
| @@ -7352,7 +7352,7 @@ |
| |
| fi |
| |
| - ac_fn_c_check_decl "$LINENO" "IPV6_ADD_MEMBERSHIP" "ac_cv_have_decl_IPV6_ADD_MEMBERSHIP" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_decl "$LINENO" "IPV6_ADD_MEMBERSHIP" "ac_cv_have_decl_IPV6_ADD_MEMBERSHIP" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_have_decl_IPV6_ADD_MEMBERSHIP" = x""yes; then : |
| ac_have_decl=1 |
| @@ -7364,7 +7364,7 @@ |
| #define HAVE_DECL_IPV6_ADD_MEMBERSHIP $ac_have_decl |
| _ACEOF |
| |
| - ac_fn_c_check_decl "$LINENO" "IPV6_MULTICAST_HOPS" "ac_cv_have_decl_IPV6_MULTICAST_HOPS" "#include \"compat/headers_slim.h\" |
| + ac_fn_c_check_decl "$LINENO" "IPV6_MULTICAST_HOPS" "ac_cv_have_decl_IPV6_MULTICAST_HOPS" "#include \"${srcdir}/compat/headers_slim.h\" |
| " |
| if test "x$ac_cv_have_decl_IPV6_MULTICAST_HOPS" = x""yes; then : |
| ac_have_decl=1 |
| diff -aruN iperf-2.0.5/configure.ac iperf-2.0.5.N/configure.ac |
| --- iperf-2.0.5/configure.ac 2010-04-10 12:23:05.000000000 -0700 |
| +++ iperf-2.0.5.N/configure.ac 2015-04-07 15:43:06.422566931 -0700 |
| @@ -176,8 +176,8 @@ |
| |
| dnl check for multicast |
| if test "$ac_cv_multicast" != no; then |
| - AC_CHECK_TYPES(struct ip_mreq,,,[#include "compat/headers_slim.h"]) |
| - AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"]) |
| + AC_CHECK_TYPES(struct ip_mreq,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| + AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| AC_MSG_CHECKING(for multicast support) |
| ac_cv_multicast=no |
| if test "$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = yes; then |
| @@ -193,9 +193,9 @@ |
| |
| dnl check for IPv6 |
| if test "$ac_cv_have_ipv6" != no; then |
| - AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "compat/headers_slim.h"]) |
| - AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "compat/headers_slim.h"]) |
| - AC_CHECK_DECLS(AF_INET6,,,[#include "compat/headers_slim.h"]) |
| + AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| + AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| + AC_CHECK_DECLS(AF_INET6,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| AC_MSG_CHECKING(for IPv6 headers and structures) |
| ac_cv_have_ipv6=no |
| if test "$ac_cv_type_struct_sockaddr_storage" = yes; then |
| @@ -211,9 +211,9 @@ |
| |
| if test "$ac_cv_have_ipv6" = yes; then |
| if test "$ac_cv_multicast" = yes; then |
| - AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "compat/headers_slim.h"]) |
| - AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"]) |
| - AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "compat/headers_slim.h"]) |
| + AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| + AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| + AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "${srcdir}/compat/headers_slim.h"]) |
| AC_MSG_CHECKING(for IPv6 multicast support) |
| ac_cv_have_ipv6_multicast=no |
| if test "$ac_cv_type_struct_ipv6_mreq" = yes; then |