check_ping is now coded with -4 & -6 options to call PING or PING6 command

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 994f3be3e7eaa4d09d85ec1a2c09a97bbfe67c10..81b019b72e09677630267d7ab5491ebe659c279f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision$)
+AC_PREREQ(2.50)
 AC_INIT(Helper.pm)
 VER=1.3.99
 REL=1
@@ -41,11 +42,6 @@ ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
 dnl AM_WITH_REGEX
 AC_PROG_RANLIB
 
-AC_PATH_PROG(ACLOCAL,aclocal)
-AC_PATH_PROG(AUTOMAKE,automake)
-AC_PATH_PROG(AUTOCONF,autoconf)
-AC_PATH_PROG(AUTOHEADER,autoheader)
-
 PLUGIN_TEST=`echo $srcdir/plugins/t/*.t|sed -e 's,\.*/plugins/,,g'`
 AC_SUBST(PLUGIN_TEST)dnl
 
@@ -623,17 +619,24 @@ dnl #### Process table test
 AC_PATH_PROG(PATH_TO_PS,ps)
 
 AC_MSG_CHECKING(for ps syntax)
+dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
+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 +UCOMM +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"
+       EXTRAS="$EXTRAS check_nagios"
+       AC_MSG_RESULT([$ac_cv_ps_command])
+
 dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
-if ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
+elif 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_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -weo 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -weo 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+       ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu comm args'"
+       ac_cv_ps_format="%s %d %d %d %d %f %s %n"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -641,13 +644,9 @@ 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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid command command'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS waxco 'rss command'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -655,13 +654,9 @@ 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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS waxno 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS waxno 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -670,13 +665,9 @@ 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_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
+       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 %*s %*s %*s %s %*s %*s %n%s"
-       ac_cv_vsz_command="$PATH_TO_PS laxnwww"
-       ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %*s %d"
-       ac_cv_rss_command="$PATH_TO_PS laxnwww"
-       ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %d"
+       ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -687,13 +678,9 @@ 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,&pos,procprog]"
+       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 %*s %*s %*s %s %*s %*s %n%s"
-       ac_cv_vsz_command="$PATH_TO_PS laxnwww"
-       ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %d"
-       ac_cv_rss_command="$PATH_TO_PS laxnwww"
-       ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %d"
+       ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -701,13 +688,9 @@ dnl OpenBSD (needs to come early because -exo appears to work, but does not give
 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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -axo 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -axo 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -715,65 +698,45 @@ dnl AIX 4.3.3 - needs verification. This works for Tru64 - needs %*[ +] in PS_FO
 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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid comm args'"
-       ac_cv_ps_format="[["%s%*[ +] %d %d %s %n"]]"
-       ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -ao 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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"]]"
        EXTRAS="$EXTRAS check_nagios"
        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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -eo 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -eo 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
 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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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'"
+       ac_cv_ps_format="%s %d %d %d %d %f %s %n"
        EXTRAS="$EXTRAS check_nagios"
        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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid comm args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -781,13 +744,9 @@ 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,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid command args'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz command'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS -ao 'rss command'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -795,13 +754,9 @@ 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,&pos,procprog]"
+       ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&pos,procprog]"
        ac_cv_ps_command="$PATH_TO_PS -el"
-       ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-       ac_cv_vsz_command="$PATH_TO_PS -el"
-       ac_cv_vsz_format="%*s %*s %*s %*s %d"
-       ac_cv_rss_command="$PATH_TO_PS -el"
-       ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
+       ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl IRIX 63
@@ -811,10 +766,6 @@ then
        ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
        ac_cv_ps_command="$PATH_TO_PS -el"
        ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-       ac_cv_vsz_command="$PATH_TO_PS -el"
-       ac_cv_vsz_format="%*s %*s %*s %*s %d"
-       ac_cv_rss_command="$PATH_TO_PS -el"
-       ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
 dnl AIX 4.1:
@@ -826,39 +777,28 @@ then
        ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
        ac_cv_ps_command="$PATH_TO_PS -el"
        ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-       ac_cv_vsz_command="$PATH_TO_PS -el"
-       ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
-       ac_cv_rss_command="$PATH_TO_PS -el"
-       ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
        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,procstat,&pos,procprog]"
+       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 %*s %*s %*s %s %*s %*s %n%s"
-       ac_cv_vsz_command="$PATH_TO_PS glaxen"
-       ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %d"
-       ac_cv_rss_command="$PATH_TO_PS glaxen"
-       ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %d"
+       ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s"
        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 STAT      VSZ    RSS   UID USER     PPID UCOMM            COMMAND
-dnl Ss       1308    272     0 root        0 init             /sbin/init
-elif ps waxo 'state vsz rss uid user ppid ucomm command' 2>/dev/null | \
-       egrep -i ["^STAT +VSZ +RSS +UID +USER +PPID +UCOMM +COMMAND"] >/dev/null
+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_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
-       ac_cv_ps_command="$PATH_TO_PS waxo 'state uid ppid ucomm command'"
-       ac_cv_ps_format="%s %d %d %s %n"
-       ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'"
-       ac_cv_vsz_format="%d %s"
-       ac_cv_rss_command="$PATH_TO_PS waxco 'rss command'"
-       ac_cv_rss_format="%d %s"
+       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"
        EXTRAS="$EXTRAS check_nagios"
        AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -869,12 +809,12 @@ 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"
-       if ps -Ao 'vsz comm' 2>/dev/null | \
-               egrep -i ["^ *VSZ +COMMAND"] >/dev/null
-       then
-               ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
-               ac_cv_vsz_format="%*s %d"
-       fi
+       #if ps -Ao 'vsz comm' 2>/dev/null | \
+       #       egrep -i ["^ *VSZ +COMMAND"] >/dev/null
+       #then
+       #       ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
+       #       ac_cv_vsz_format="%*s %d"
+       #fi
        AC_MSG_RESULT([$ac_cv_ps_command])
 
 else
@@ -887,14 +827,6 @@ AC_DEFINE_UNQUOTED(PS_COMMAND,"$ac_cv_ps_command",
        [Verbatim command to execute for ps in check_procs])
 AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format",
        [Format string for scanning ps output in check_procs])
-AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$ac_cv_vsz_command",
-       [Verbatim command to execute for ps in check_vsz])
-AC_DEFINE_UNQUOTED(VSZ_FORMAT,"$ac_cv_vsz_format",
-       [Format string for scanning ps output in check_vsz])
-AC_DEFINE_UNQUOTED(RSS_COMMAND,"$ac_cv_rss_command",
-       [Verbatim command to execute for ps in check_rss])
-AC_DEFINE_UNQUOTED(RSS_FORMAT,"$ac_cv_rss_format",
-       [Format string for scanning ps output in check_rss])
 
 AC_PATH_PROG(PATH_TO_DF,df)
 AC_PATH_PROG(PATH_TO_BDF,bdf)
@@ -1337,6 +1269,14 @@ else
        AC_MSG_WARN([Could not find mailq or eqivalent])
 fi
 
+AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat)
+if test -x "$PATH_TO_QMAIL_QSTAT"
+then
+       AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_QMAIL_QSTAT",[path to qmail-qstat])
+else
+       AC_MSG_WARN([Could not find qmail-qstat or eqivalent])
+fi
+
 dnl SWAP info required is amount allocated/available and amount free
 dnl The plugin works through all the swap devices and adds up the total swap
 dnl available.
@@ -1365,16 +1305,19 @@ then
                >/dev/null]
        then
                ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %d %d"]
+               ac_cv_swap_conv=2048
                AC_MSG_RESULT([using IRIX format swap])
 
        elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^swapfile +dev +swaplo +blocks +free" >/dev/null]
        then
-               ac_cv_swap_format=["%*s %*[[0-9,-]] %*d %d %d"]
+               ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"]
+               ac_cv_swap_conv=2048
                AC_MSG_RESULT([using Solaris format swap])
 
        elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^path +dev +swaplo +blocks +free" >/dev/null]
        then
-               ac_cv_swap_format=["%*s %*[[0-9,-]] %*d %d %d"]
+               ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"]
+               ac_cv_swap_conv=2048
                AC_MSG_RESULT([using Unixware format swap])
 
        fi
@@ -1388,6 +1331,7 @@ then
        if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
        then
                ac_cv_swap_format=["%*s %d %*d %d"]
+               ac_cv_swap_conv=1024
                AC_MSG_RESULT([using FreeBSD format swapinfo])
        fi
        EXTRAS="$EXTRAS check_swap"
@@ -1397,19 +1341,22 @@ then
        ac_cv_have_swap=yes
        ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM",
        ac_cv_swap_format=["%*s %d %*d %d"]
+       ac_cv_swap_conv=1024
        AC_MSG_RESULT([using HP-UX format swapinfo])
 fi
 
-if test x$ac_cv_have_swap != x 
+if test "x$ac_cv_have_swap" != "x" 
 then
        AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
 fi
-AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format",
-       [Format string for parsing swap output])
 if test "x$ac_cv_swap_command" != "x" 
 then
        AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command",
                [Path to swap/swapinfo binary, with any args])
+       AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format",
+               [Format string for parsing swap output])
+       AC_DEFINE_UNQUOTED(SWAP_CONVERSION,$ac_cv_swap_conv,
+               [Conversion factor to MB])
 fi
 
 AC_PATH_PROG(PATH_TO_DIG,dig)