[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.54,1.55
Jeremy T. Bouse
undrgrid at users.sourceforge.net
Tue Mar 11 10:33:04 CET 2003
Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv28912
Modified Files:
configure.in
Log Message:
Minor change to Karl's statfs check
Inclusion of ICMPv6 ping tests to define PING6_COMMAND
Minor fix to ps syntax checking to fix bug I introduced last nite
Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** configure.in 11 Mar 2003 07:04:56 -0000 1.54
--- configure.in 11 Mar 2003 18:32:08 -0000 1.55
***************
*** 43,48 ****
#include <sys/vfs.h>],
[struct statfs t; long c = *(t.f_spare);],
! fu_cv_sys_truncating_statfs=yes,
! fu_cv_sys_truncating_statfs=no,
)])
if test $fu_cv_sys_truncating_statfs = yes; then
--- 43,50 ----
#include <sys/vfs.h>],
[struct statfs t; long c = *(t.f_spare);],
! fu_cv_sys_truncating_statfs=yes
! AC_MSG_RESULT(yes),
! fu_cv_sys_truncating_statfs=no
! AC_MSG_RESULT(no),
)])
if test $fu_cv_sys_truncating_statfs = yes; then
***************
*** 597,602 ****
dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
if ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ \
! +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 599,603 ----
dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
if ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 630,635 ****
dnl BSD-like mode in RH 6.1
elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] \
! >/dev/null
then
ac_cv_use_ps_vars=yes
--- 631,635 ----
dnl BSD-like mode in RH 6.1
elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 647,653 ****
dnl SunOS 4.1.3:
dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND
! elif ps -laxnwww 2>/dev/null | egrep -i ["^ *F(LAGS)? +UID +PID +PPID \
! +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME \
! +COMMAND"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 647,652 ----
dnl SunOS 4.1.3:
dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND
! elif ps -laxnwww 2>/dev/null | \
! egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 667,672 ****
dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2]
dnl
! elif ps laxnwww 2>/dev/null | egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI \
! +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 666,671 ----
dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2]
dnl
! elif ps laxnwww 2>/dev/null | \
! egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 684,689 ****
dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
elif ps -axo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ \
! +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 683,687 ----
dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
elif ps -axo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 701,706 ****
dnl AIX 4.3.3 - needs verification. This works for Tru64 - needs %*[ +] in PS_FORMAT
elif ps -ao 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ \
! +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 699,703 ----
dnl AIX 4.3.3 - needs verification. This works for Tru64 - needs %*[ +] in PS_FORMAT
elif ps -ao 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 717,722 ****
elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ \
! +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 714,718 ----
elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 733,738 ****
elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER \
! +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 729,733 ----
elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 749,754 ****
elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER \
! +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 744,748 ----
elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 765,770 ****
elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER \
! +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 759,763 ----
elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 782,787 ****
dnl wonder who takes state instead of stat
elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER \
! +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 775,779 ----
dnl wonder who takes state instead of stat
elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | \
! egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 798,803 ****
dnl IRIX 53
! elif ps -el 2>/dev/null | egrep -i ["^ *F +S +UID +PID +PPID +C +PRI \
! +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 790,795 ----
dnl IRIX 53
! elif ps -el 2>/dev/null | \
! egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 812,817 ****
dnl IRIX 63
! elif ps -el 2>/dev/null | egrep -i ["^ *F +S +UID +PID +PPID +C +PRI \
! +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 804,809 ----
dnl IRIX 63
! elif ps -el 2>/dev/null | \
! egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 828,833 ****
dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD
dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper
! elif ps -el 2>/dev/null | egrep -i ["^ *F +S +UID +PID +PPID +C +PRI \
! +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 820,825 ----
dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD
dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper
! elif ps -el 2>/dev/null | \
! egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 842,847 ****
dnl AIX?
! elif ps glaxen 2>/dev/null | egrep -i ["^ *F +UID +PID +PPID +PRI +NI \
! +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 834,839 ----
dnl AIX?
! elif ps glaxen 2>/dev/null | \
! egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 875,880 ****
dnl UnixWare
! elif ps -Al 2>/dev/null | egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI \
! +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
then
ac_cv_use_ps_vars=yes
--- 867,872 ----
dnl UnixWare
! elif ps -Al 2>/dev/null | \
! egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
then
ac_cv_use_ps_vars=yes
***************
*** 962,970 ****
ac_cv_ping_command=$withval,)
! AC_MSG_CHECKING(for ping syntax)
if test -n "$ac_cv_ping_command"
then
AC_MSG_RESULT([(command-line) $ac_cv_ping_command])
! if test -n "$PING_PACKETS_FIRST"
then
ac_cv_ping_packets_first=yes
--- 954,963 ----
ac_cv_ping_command=$withval,)
! AC_MSG_CHECKING(for ICMP ping syntax)
! ac_cv_ping_packets_first=no
if test -n "$ac_cv_ping_command"
then
AC_MSG_RESULT([(command-line) $ac_cv_ping_command])
! if test -n "$ac_cv_ping_packets_first"
then
ac_cv_ping_packets_first=yes
***************
*** 1040,1044 ****
[path and args for ICMP ping command])
! if test x$ac_cv_ping_packets_first != xno
then
AC_DEFINE(PING_PACKETS_FIRST,1,
--- 1033,1037 ----
[path and args for ICMP ping command])
! if test "x$ac_cv_ping_packets_first" != "xno"
then
AC_DEFINE(PING_PACKETS_FIRST,1,
***************
*** 1049,1053 ****
ACX_HELP_STRING([--with-ping6-command=SYNTAX],
[sets syntax for ICMPv6 ping]),
! PING6_COMMAND=$withval,)
AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
--- 1042,1196 ----
ACX_HELP_STRING([--with-ping6-command=SYNTAX],
[sets syntax for ICMPv6 ping]),
! ac_cv_ping6_command=$withval,)
!
! AC_MSG_CHECKING(for ICMPv6 ping syntax)
! ac_cv_ping6_packets_first=no
! if test -n "$ac_cv_ping6_command"
! then
! AC_MSG_RESULT([(command-line) $ac_cv_ping6_command])
! if test -n "$ac_cv_ping6_packets_first"
! then
! ac_cv_ping6_packets_first=yes
! fi
!
! 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 | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n %s -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 %s -n %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping_command="$PATH_TO_PING6 -n -s 56 -c %d %s"
! ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
!
! elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING6 -n -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! fi
!
! elif test "x$PATH_TO_PING" != "x"; then
! if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
! $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 %s -n %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d"
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s"
! ac_cv_ping_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping_command])
!
! elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
! egrep -i "^round-trip|^rtt" >/dev/null
! then
! ac_cv_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
! ac_cv_ping6_packets_first=yes
! AC_MSG_RESULT([$ac_cv_ping6_command])
!
! fi
!
! fi
!
! if test "x$ac_cv_ping6_command" != "x"; then
! AC_DEFINE_UNQUOTED(PING6_COMMAND,"$ac_cv_ping6_command",
! [path and args for ICMPv6 ping command])
! else
! AC_MSG_RESULT([none])
! fi
!
! if test "x$ac_cv_ping6_packets_first" != "xno"; then
! AC_DEFINE(PING6_PACKETS_FIRST,1,
! [Define if packet count must precede host])
! fi
AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
More information about the Commits
mailing list