[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.28,1.29

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv17188

Modified Files:
	configure.in 
Log Message:
get long args output to work on check_procs by putting incantations with -w ahead of others

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** configure.in	22 Nov 2002 02:33:43 -0000	1.28
--- configure.in	22 Nov 2002 02:46:49 -0000	1.29
***************
*** 401,405 ****
  
  AC_PATH_PROG(PATH_TO_PS,ps)
- dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
  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]
--- 401,404 ----
***************
*** 416,419 ****
--- 415,480 ----
  	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
    echo "      ps syntax... $PATH_TO_PS -weo 'stat comm vsz rss user ppid args'"
+ 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
+ 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[])
+ 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'",[])
+ 	EXTRAS="$EXTRAS check_nagios"
+ 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'",[])
+ 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
+ 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[])
+ 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
+ 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'",[])
+ 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
+ 	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
+ 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
+ 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[])
+ 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxno 'state user ppid comm'",[])
+ 	EXTRAS="$EXTRAS check_nagios"
+ 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'",[])
+ 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
+ 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxno 'vsz comm'",[])
+ 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
+ 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'",[])
+ 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
+ 	echo "      ps syntax... $PATH_TO_PS -waxco 'state comm vsz rss'"
+ dnl SunOS 4.1.3:
+ dnl  F  UID  PID  PPID  CP  PRI  NI  SZ  RSS  WCHAN  STAT  TT  TIME  COMMAND
+ dnl
+ 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
+ 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	EXTRAS="$EXTRAS check_nagios"
+ 	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
+ 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -laxnwww",[])
+ 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
+ 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
+ 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %d",[])
+ 	echo "      ps syntax... $PATH_TO_PS laxnwww"
+ 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
+ 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	EXTRAS="$EXTRAS check_nagios"
+ 	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
+ 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
+ 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
+ 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[])
+ 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
+ 	echo "      ps syntax... $PATH_TO_PS laxnwww"
+ 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
***************
*** 509,540 ****
  	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
  	echo "      ps syntax... $PATH_TO_PS -ao 'state command vsz rss'"
- 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
- 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[])
- 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'",[])
- 	EXTRAS="$EXTRAS check_nagios"
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'",[])
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
- 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'",[])
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'",[])
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
- 	echo "      ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'"
- 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
- 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[])
- 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxno 'state user ppid comm'",[])
- 	EXTRAS="$EXTRAS check_nagios"
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxno 'state uid ppid comm args'",[])
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
- 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxno 'vsz comm'",[])
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'",[])
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
- 	echo "      ps syntax... $PATH_TO_PS -waxco 'state comm vsz rss'"
  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]
--- 570,573 ----
***************
*** 561,597 ****
  	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
  	echo "      ps syntax... $PATH_TO_PS -el"
- dnl SunOS 4.1.3:
- dnl  F  UID  PID  PPID  CP  PRI  NI  SZ  RSS  WCHAN  STAT  TT  TIME  COMMAND
- dnl
- 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
- 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	EXTRAS="$EXTRAS check_nagios"
- 	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -laxnwww",[])
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
- 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %d",[])
- 	echo "      ps syntax... $PATH_TO_PS laxnwww"
- 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
- 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	EXTRAS="$EXTRAS check_nagios"
- 	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
- 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS laxnwww",[])
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
- 	echo "      ps syntax... $PATH_TO_PS laxnwww"
  dnl    
  dnl AIX 4.1:
--- 594,597 ----