diff options
| author |  Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2009-12-04 15:24:15 -0500 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2009-12-05 01:27:47 -0500 |
| commit | 96a23a4c117a9c2665ca09e5964eacf028dbcdcf (patch) | |
| tree | 2ad5a6f21c337251fc541bce454cc5511ecf9885 | |
| parent | 96f22d97ec3ecf66ef600a446b65cdf9ad5e8619 (diff) | |
| download | monitoring-plugins-96a23a4c117a9c2665ca09e5964eacf028dbcdcf.tar.gz | |
Detect arguments passed via --with-ping[6]-command (#2908236)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.in | 19 |
2 files changed, 18 insertions, 2 deletions
@@ -7,6 +7,7 @@ This file documents the major additions and syntax changes between releases. Add proxy-authorization option to check_http (Marcel Kuiper - #1323230, Bryan Irvine - #2863925) check_icmp now increment the sequence counter in each packet Fix usage of repeated -o options in check_snmp + Try to detect arguments passed via --with-ping[6]-command and set options accordingly (#2908236) WARNINGS Updated developer documentation to say that performance labels should not have an equals sign or single quote in the label diff --git a/configure.in b/configure.in index f3547349..d02d7f85 100644 --- a/configure.in +++ b/configure.in @@ -877,10 +877,17 @@ ac_cv_ping_has_timeout=no if test -n "$with_ping_command" then AC_MSG_RESULT([(command-line) $with_ping_command]) - if test -n "$ac_cv_ping_packets_first" + if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null then ac_cv_ping_packets_first=yes ac_cv_ping_has_timeout=yes + elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \ + echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null + then + ac_cv_ping_has_timeout=yes + elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null + then + ac_cv_ping_packets_first=yes fi elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ @@ -981,7 +988,15 @@ ac_cv_ping6_packets_first=no if test -n "$with_ping6_command" then AC_MSG_RESULT([(command-line) $with_ping6_command]) - if test -n "$ac_cv_ping6_packets_first" + if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null + then + ac_cv_ping6_packets_first=yes + elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \ + echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null + then + # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout + true + elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null then ac_cv_ping6_packets_first=yes fi |