From b9c9db5fdff9575015e4c38a5fab70b229c5d8a8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 25 Feb 2016 14:58:02 +0100
Subject: check for ping -{4,6} from new upstream iputils

---
 configure.ac | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index dfc37b5e..89eda3a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,6 +1225,16 @@ elif [[ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]]; then
 	ac_cv_ping6_packets_first=yes
 	ac_cv_ping_has_timeout=yes
 	AC_MSG_RESULT([$with_ping6_command])
+
+elif test "x$PATH_TO_PING" != "x" && \
+	$PATH_TO_PING -6 -n -U -w 10 -c 1 ::1 2>/dev/null | \
+	egrep -i "^round-trip|^rtt" >/dev/null
+then
+	with_ping6_command="$PATH_TO_PING -6 -n -U -w %d -c %d %s"
+	ac_cv_ping6_packets_first=yes
+	ac_cv_ping_has_timeout=yes
+	AC_MSG_RESULT([$with_ping6_command])
+
 elif test "x$PATH_TO_PING6" != "x"; then
 	if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
 		$PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
-- 
cgit v1.2.3-74-g34f1