summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--configure.in19
2 files changed, 18 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f5be201..667e1f0 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ This file documents the major additions and syntax changes between releases.
7 Add proxy-authorization option to check_http (Marcel Kuiper - #1323230, Bryan Irvine - #2863925) 7 Add proxy-authorization option to check_http (Marcel Kuiper - #1323230, Bryan Irvine - #2863925)
8 check_icmp now increment the sequence counter in each packet 8 check_icmp now increment the sequence counter in each packet
9 Fix usage of repeated -o options in check_snmp 9 Fix usage of repeated -o options in check_snmp
10 Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236)
10 WARNINGS 11 WARNINGS
11 Updated developer documentation to say that performance labels should not have an equals sign or 12 Updated developer documentation to say that performance labels should not have an equals sign or
12 single quote in the label 13 single quote in the label
diff --git a/configure.in b/configure.in
index f354734..d02d7f8 100644
--- a/configure.in
+++ b/configure.in
@@ -877,10 +877,17 @@ ac_cv_ping_has_timeout=no
877if test -n "$with_ping_command" 877if test -n "$with_ping_command"
878then 878then
879 AC_MSG_RESULT([(command-line) $with_ping_command]) 879 AC_MSG_RESULT([(command-line) $with_ping_command])
880 if test -n "$ac_cv_ping_packets_first" 880 if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
881 then 881 then
882 ac_cv_ping_packets_first=yes 882 ac_cv_ping_packets_first=yes
883 ac_cv_ping_has_timeout=yes 883 ac_cv_ping_has_timeout=yes
884 elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
885 echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
886 then
887 ac_cv_ping_has_timeout=yes
888 elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
889 then
890 ac_cv_ping_packets_first=yes
884 fi 891 fi
885 892
886elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ 893elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
@@ -981,7 +988,15 @@ ac_cv_ping6_packets_first=no
981if test -n "$with_ping6_command" 988if test -n "$with_ping6_command"
982then 989then
983 AC_MSG_RESULT([(command-line) $with_ping6_command]) 990 AC_MSG_RESULT([(command-line) $with_ping6_command])
984 if test -n "$ac_cv_ping6_packets_first" 991 if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
992 then
993 ac_cv_ping6_packets_first=yes
994 elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
995 echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
996 then
997 # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
998 true
999 elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
985 then 1000 then
986 ac_cv_ping6_packets_first=yes 1001 ac_cv_ping6_packets_first=yes
987 fi 1002 fi