--- nagios-plugins-1.4/configure.in.orig 2005-02-04 10:44:27 +1000 +++ nagios-plugins-1.4/configure.in 2005-02-14 02:19:49 +1000 @@ -398,7 +398,7 @@ fi dnl Check for OpenSSL location -AC_PATH_PROG(OPENSSL,openssl) +AC_PATH_PROG(OPENSSL,openssl,[/usr/bin/openssl]) if test "$OPENSSL" = "/usr/bin/openssl"; then OPENSSL=/usr elif test "$OPENSSL" = "/usr/sbin/openssl"; then @@ -575,244 +575,22 @@ AC_DEFINE_UNQUOTED(SOCKET_SIZE_TYPE, $ac_cv_socket_size_type , [Define type of socket size]) -if test -f "/proc/loadavg" -then - AC_DEFINE(HAVE_PROC_LOADAVG,1,[Define if /proc/loadavg or similar exists]) - AC_DEFINE_UNQUOTED(PROC_LOADAVG,"/proc/loadavg",[Location of /proc/loadavg]) -fi +AC_DEFINE(HAVE_PROC_LOADAVG,1,[Define if /proc/loadavg or similar exists]) +AC_DEFINE_UNQUOTED(PROC_LOADAVG,"/proc/loadavg",[Location of /proc/loadavg]) dnl #### Process table test -AC_PATH_PROG(PATH_TO_PS,ps) +AC_PATH_PROG(PATH_TO_PS,ps,[/bin/ps]) AC_MSG_CHECKING(for ps syntax) dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo dnl Should also work for FreeBSD 5.2.1 and 5.3 dnl STAT UCOMM VSZ RSS USER PPID COMMAND -if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ - egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null -then - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. -dnl Limitation: Only first 16 chars returned for ucomm field -dnl Must come before ps -weo -elif ps -axwo 'stat uid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ - egrep -i ["^ *STAT +UID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null -then - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu ucomm command'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND -elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \ - egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null -then - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu etime comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %s %n" - ac_cv_ps_cols=9 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl FreeBSD -elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | \ - egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null -then - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl SunOS 4.1.3: -dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND -dnl Need the head -1 otherwise test will work because arguments are found -elif ps -laxnwww 2>/dev/null | head -1 | \ - egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null -then - ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS -laxnwww" - ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl Debian Linux / procps v1.2.9: -dnl FLAGS UID PID PPID PRI NI SIZE RSS WCHAN STA TTY TIME COMMAND -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_ps_varlist="[&procuid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS laxnwww" - ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl 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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format=["%s%*[ +] %d %d %d %d %f %s %n"] - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl AIX 4.3.3 and 5.1 do not have an rss field -elif ps -eo 'stat uid ppid vsz pcpu comm args' 2>/dev/null | \ - egrep -i ["^ *S[TAUES]* +UID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null -then - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid ppid vsz pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %f %s %n" - ac_cv_ps_cols=7 - AC_MSG_RESULT([$ac_cv_ps_command - with no RSS]) - -dnl Solaris 2.6 -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid vsz rss pcpu comm args'" - # There must be no space between the %s and %n due to a wierd problem in sscanf where - # it will return %n as longer than the line length - ac_cv_ps_format="%s %d %d %d %d %f %s%n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid vsz rss pcpu comm args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=8 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid vsz rss pcpu command args'" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=7 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)" - ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s" - ac_cv_ps_cols=7 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)" - ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - ac_cv_ps_cols=5 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl AIX 4.1: -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_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)" - ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - ac_cv_ps_cols=5 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS glaxen" - ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s" - ac_cv_ps_cols=7 - AC_MSG_RESULT([$ac_cv_ps_command]) - -dnl MacOSX / Darwin -dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT -dnl Some truncation will happen in UCOMM column -dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND -dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon -elif ps wwaxo 'state vsz rss uid ppid pcpu ucomm command' 2>/dev/null | \ - egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null -then - ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid ppid pcpu ucomm command'" - ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procppid,&procpcpu,procprog,&pos]" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_cols=7 - AC_MSG_RESULT([$ac_cv_ps_command]) - -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_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" - ac_cv_ps_command="$PATH_TO_PS -Al" - ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - ac_cv_ps_cols=7 - AC_MSG_RESULT([$ac_cv_ps_command]) - -else - AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled]) -fi +ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" +ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid ppid vsz rss pcpu comm args'" +ac_cv_ps_format="%s %d %d %d %d %f %s %n" +ac_cv_ps_cols=8 +AC_MSG_RESULT([$ac_cv_ps_command]) if test -n "$ac_cv_ps_varlist" ; then AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist, @@ -826,7 +604,7 @@ EXTRAS="$EXTRAS check_procs check_nagios" fi -AC_PATH_PROG(PATH_TO_PING,ping) +AC_PATH_PROG(PATH_TO_PING,ping,[/bin/ping]) AC_PATH_PROG(PATH_TO_PING6,ping6) AC_ARG_WITH(ping_command, @@ -837,85 +615,9 @@ AC_MSG_CHECKING(for ICMP ping syntax) ac_cv_ping_packets_first=no 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" - then - ac_cv_ping_packets_first=yes - fi - -elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ - $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -U -c %d %s" - ac_cv_ping_packets_first=yes - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" - ac_cv_ping_packets_first=yes - ac_cv_ping_has_timeout=yes - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -U -c %d %s" - ac_cv_ping_packets_first=yes - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -c %d %s" - ac_cv_ping_packets_first=yes - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n %s -c %d" - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING %s -n %d" - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -s %s 56 %d" - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" - ac_cv_ping_packets_first=yes - AC_MSG_RESULT([$with_ping_command]) - -elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null -then - with_ping_command="$PATH_TO_PING -n -c %d %s" - ac_cv_ping_packets_first=yes - AC_MSG_RESULT([$with_ping_command]) - -else - AC_MSG_WARN([unable to find usable ping syntax]) -fi +with_ping_command="$PATH_TO_PING -n -c %d %s" +ac_cv_ping_packets_first=yes +AC_MSG_RESULT([$with_ping_command]) AC_DEFINE_UNQUOTED(PING_COMMAND,"$with_ping_command", [path and args for ICMP ping command]) @@ -1089,7 +791,7 @@ fi fi -AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup) +AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup,[/usr/bin/nslookup]) AC_MSG_CHECKING(for nslookup syntax) if test -n "$PATH_TO_NSLOOKUP" @@ -1108,12 +810,16 @@ else AC_MSG_WARN([nslookup command not found]) + AC_MSG_RESULT([ nslookup syntax... $PATH_TO_NSLOOKUP -sil]) + AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP -sil",[path and args for nslookup]) + AC_MSG_WARN([nslookup command not found - set path to default]) + EXTRAS="$EXTRAS check_dns" fi AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup]) -AC_PATH_PROG(PATH_TO_HOST,host) +AC_PATH_PROG(PATH_TO_HOST,host,[/usr/bin/host]) if test -n "$ac_cv_path_PATH_TO_HOST" then EXTRAS="$EXTRAS check_dns" @@ -1125,16 +831,11 @@ AC_PATH_PROG(PATH_TO_RPCINFO,rpcinfo) AC_DEFINE_UNQUOTED(PATH_TO_RPCINFO,"$PATH_TO_RPCINFO",[path to rpcinfo binary]) -AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate) -AC_PATH_PROGS(PATH_TO_NTPDC,ntpdc xntpdc) -AC_PATH_PROGS(PATH_TO_NTPQ,ntpq) -if (test -x "$PATH_TO_NTPDATE" || test -x "$PATH_TO_NTPQ") -then - AC_DEFINE_UNQUOTED(PATH_TO_NTPQ,"$PATH_TO_NTPQ",[path to ntpq binary]) - AC_DEFINE_UNQUOTED(PATH_TO_NTPDATE,"$PATH_TO_NTPDATE",[path to ntpdate binary]) -else - AC_MSG_WARN([Install NTP programs (http://www.ntp.org) if you want to monitor time synchronization]) -fi +AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate,[/usr/sbin/ntpdate]) +AC_PATH_PROGS(PATH_TO_NTPDC,ntpdc xntpdc,[/usr/sbin/ntpdc]) +AC_PATH_PROGS(PATH_TO_NTPQ,ntpq,[/usr/sbin/ntpq]) +AC_DEFINE_UNQUOTED(PATH_TO_NTPQ,"$PATH_TO_NTPQ",[path to ntpq binary]) +AC_DEFINE_UNQUOTED(PATH_TO_NTPDATE,"$PATH_TO_NTPDATE",[path to ntpdate binary]) AC_PATH_PROG(PATH_TO_LMSTAT,lmstat) if test -x "$PATH_TO_LMSTAT" @@ -1144,99 +845,37 @@ AC_MSG_WARN([Get lmstat from Globetrotter Software to monitor flexlm licenses]) fi -AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient) -if test -x "$PATH_TO_SMBCLIENT" -then - AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT",[path to smbclient binary]) -else - AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares]) -fi +AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient,[/usr/bin/smbclient]) +AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT",[path to smbclient binary]) - -AC_PATH_PROG(PATH_TO_WHO,who) - -if [$PATH_TO_WHO -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null] -then - ac_cv_path_to_who="$PATH_TO_WHO -q" -else - ac_cv_path_to_who="$PATH_TO_WHO" -fi +AC_PATH_PROG(PATH_TO_WHO,who,[/usr/bin/who]) +ac_cv_path_to_who="$PATH_TO_WHO -q" AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", [path and arguments for invoking 'who']) -AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) -if test -x "$PATH_TO_SNMPGET" -then - AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary]) - EXTRAS="$EXTRAS check_hpjd check_snmp" -else - AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins]) -fi - -AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext) -if test -x "$PATH_TO_SNMPGETNEXT" -then - AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary]) -fi - -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) -then - AC_MSG_CHECKING(for Net::SNMP perl module) - AC_MSG_RESULT([found]) -else - AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) -fi - -AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) -AC_PATH_PROG(PATH_TO_QSTAT,qstat) +AC_PATH_PROG(PATH_TO_SNMPGET,snmpget,[/usr/bin/snmpget]) +AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary]) +EXTRAS="$EXTRAS check_hpjd check_snmp" + +AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext,[/usr/bin/snmpgetnext]) +AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary]) + +AC_PATH_PROG(PATH_TO_QSTAT,qstat,[/usr/bin/qstat]) +ac_cv_path_to_qstat="$PATH_TO_QSTAT" +EXTRAS="$EXTRAS check_game" +AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",[path to qstat/quakestat]) + +AC_PATH_PROG(PATH_TO_FPING,fping,[/usr/sbin/fping]) +AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping]) +EXTRAS="$EXTRAS check_fping" + +AC_PATH_PROG(PATH_TO_SSH,ssh,[/usr/bin/ssh]) +AC_DEFINE_UNQUOTED(SSH_COMMAND,"$PATH_TO_SSH",[path to ssh binary]) +EXTRAS="$EXTRAS check_by_ssh" -if test -x "$PATH_TO_QUAKESTAT" -then - ac_cv_path_to_qstat="$PATH_TO_QUAKESTAT" - EXTRAS="$EXTRAS check_game" - -elif test -x "$PATH_TO_QSTAT" -then - ac_cv_path_to_qstat="$PATH_TO_QSTAT" - EXTRAS="$EXTRAS check_game" -else - AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin]) -fi - -if test $ac_cv_path_to_qstat -then - AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", - [path to qstat/quakestat]) -fi - -AC_PATH_PROG(PATH_TO_FPING,fping) -if test -x "$PATH_TO_FPING" -then - AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping]) - EXTRAS="$EXTRAS check_fping" -else - AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) -fi - -AC_PATH_PROG(PATH_TO_SSH,ssh) - -if test -x "$PATH_TO_SSH" -then - AC_DEFINE_UNQUOTED(SSH_COMMAND,"$PATH_TO_SSH",[path to ssh binary]) - EXTRAS="$EXTRAS check_by_ssh" -else - AC_MSG_WARN([Get ssh in order to make check_by_ssh plugin]) -fi - - -AC_PATH_PROG(PATH_TO_MAILQ,mailq) -if test -x "$PATH_TO_MAILQ" -then - AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq]) -else - AC_MSG_WARN([Could not find mailq or eqivalent]) -fi +AC_PATH_PROG(PATH_TO_MAILQ,mailq,[/usr/bin/mailq]) +AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq]) AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat) if test -x "$PATH_TO_QMAIL_QSTAT" @@ -1429,17 +1068,12 @@ dnl fine on linux, broken on solaris dnl if /bin/test -e "/proc/meminfo" AC_MSG_CHECKING([for /proc/meminfo]) -if [cat /proc/meminfo > /dev/null 2>&1] -then - AC_MSG_RESULT([found /proc/meminfo]) - AC_DEFINE(HAVE_PROC_MEMINFO,1,[Define if we have /proc/meminfo]) - AC_DEFINE_UNQUOTED(PROC_MEMINFO,"/proc/meminfo",[path to /proc/meminfo if name changes]) - EXTRAS="$EXTRAS check_swap" -else - AC_MSG_RESULT([no]) -fi +echo "** ALT: /proc/meminfo for check_swap" +AC_DEFINE(HAVE_PROC_MEMINFO,1,[Define if we have /proc/meminfo]) +AC_DEFINE_UNQUOTED(PROC_MEMINFO,"/proc/meminfo",[path to /proc/meminfo if name changes]) +EXTRAS="$EXTRAS check_swap" -AC_PATH_PROG(PATH_TO_DIG,dig) +AC_PATH_PROG(PATH_TO_DIG,dig,[/usr/bin/dig]) AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG",[Path to dig command, if present]) if test -n "$PATH_TO_DIG"; then EXTRAS="$EXTRAS check_dig"