[Nagiosplug-checkins] CVS: nagiosplug acconfig.h,1.6,1.7 configure.in,1.50,1.51

Jeremy T. Bouse undrgrid at users.sourceforge.net
Mon Mar 10 15:59:06 CET 2003


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

Modified Files:
	acconfig.h configure.in 
Log Message:
Cleaned up configure for PS and PING to produce cleaner config.h


Index: acconfig.h
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/acconfig.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** acconfig.h	14 Nov 2002 18:25:08 -0000	1.6
--- acconfig.h	10 Mar 2003 23:58:15 -0000	1.7
***************
*** 1,54 ****
- #undef CGIURL
- #undef COMPILER_SUPPORTS_LL
- #undef DF_COMMAND
- #undef HAVE_ASPRINTF
- #undef HAVE_C99_VSNPRINTF
- #undef HAVE_GETOPT_H
- #undef HAVE_GETOPT_LONG
- #undef HAVE_GETTIMEOFDAY
- #undef HAVE_LONGLONG
- #undef HAVE_PROC_LOADAVG
- #undef HAVE_PROC_MEMINFO
- #undef HAVE_SSL
- #undef HAVE_SNPRINTF
- #undef HAVE_SWAP
- #undef HAVE_VA_COPY
- #undef HAVE_VASPRINTF
- #undef HAVE_VSNPRINTF
- #undef NEED_GETTIMEOFDAY
- #undef NSLOOKUP_COMMAND
- #undef HOST_COMMAND
- #undef PACKAGE_VERSION
- #undef PATH_TO_DIG
- #undef PATH_TO_FPING
- #undef PATH_TO_QSTAT
- #undef PATH_TO_SNMPGET
- #undef PATH_TO_SNMPGETNEXT
- #undef PATH_TO_UPTIME
- #undef PATH_TO_RPCINFO
- #undef PATH_TO_NTPDATE
- #undef PATH_TO_NTPDC
- #undef PATH_TO_LMSTAT
- #undef PATH_TO_SMBCLIENT
- #undef PATH_TO_MAILQ
- #undef PING_COMMAND
- #undef PING_PACKETS_FIRST
- #undef POSIX_STATE_DEFS
- #undef PROC_LOADAVG
- #undef PROC_MEMINFO
  #undef PS_COMMAND
- #undef PS_FORMAT
  #undef PS_RAW_COMMAND
  #undef PS_VARLIST
  #undef RSS_COMMAND
  #undef RSS_FORMAT
- #undef SOCKET_SIZE_TYPE
- #undef SSH_COMMAND
- #undef SWAP_COMMAND
- #undef SWAP_FORMAT
- #undef USE_PS_VARS
  #undef VSZ_COMMAND
  #undef VSZ_FORMAT
- #undef WHO_COMMAND
- #undef PACKAGE
- #undef VERSION
--- 1,7 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** configure.in	8 Mar 2003 11:44:37 -0000	1.50
--- configure.in	10 Mar 2003 23:58:16 -0000	1.51
***************
*** 54,58 ****
  
  dnl CGIURL has changed for Nagios with 1.0 beta
- dnl AC_ARG_WITH(cgiurl,--with-cgiurl=<dir> sets URL for cgi programs,cgiurl=$withval,cgiurl=/nagios/cgi-bin)
  AC_ARG_WITH(cgiurl,
  	ACX_HELP_STRING([--with-cgiurl=DIR],
--- 54,57 ----
***************
*** 63,67 ****
  AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
  
- dnl AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name to run nagios,nagios_usr=$withval,nagios_usr=nagios)
  AC_ARG_WITH(nagios_user,
  	ACX_HELP_STRING([--with-nagios-user=USER],
--- 62,65 ----
***************
*** 69,73 ****
  	nagios_usr=$withval,
  	nagios_usr=nagios)
- dnl AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
  AC_ARG_WITH(nagios_group,
  	ACX_HELP_STRING([--with-nagios-group=GROUP],
--- 67,70 ----
***************
*** 80,84 ****
  AC_SUBST(INSTALL_OPTS)
  
- dnl AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
  AC_ARG_WITH(trusted_path,
  	ACX_HELP_STRING([--with-trusted-path=PATH],
--- 77,80 ----
***************
*** 132,136 ****
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
- dnl AC_ARG_WITH(pgsql,--with-pgsql=<dir> sets path to pgsql installation,[PGSQL=$withval])
  AC_ARG_WITH(pgsql,
  	ACX_HELP_STRING([--with-pgsql=DIR],
--- 128,131 ----
***************
*** 213,217 ****
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
- dnl AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
  AC_ARG_WITH(mysql,
  	ACX_HELP_STRING([--with-mysql=DIR],
--- 208,211 ----
***************
*** 271,275 ****
    OPENSSL=/usr/local/ssl
  fi
- dnl AC_ARG_WITH(openssl,--with-openssl=<dir> sets path to openssl installation,[OPENSSL=$withval])
  AC_ARG_WITH(openssl,
  	ACX_HELP_STRING([--with-openssl=DIR],
--- 265,268 ----
***************
*** 555,814 ****
  fi
  
  AC_PATH_PROG(PATH_TO_PS,ps)
  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_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -weo 'stat user ppid args'",[Verbatim command to execute for ps in check_netsaint])
  	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -weo 'stat uid ppid comm args'",[Verbatim command to execute for ps in check_procs])
! 	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 -weo 'vsz comm'",[Verbatim command to execute for ps in check_vsz])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[Format string for scanning ps output in check_vsz])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -weo 'rss comm'",[Verbatim command to execute for ps in check_rss])
! 	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
! 	AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'stat user ppid args'",[Verbatim command to execute for ps in check_netsaint])
  	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'stat uid ppid comm args'",[Verbatim command to execute for ps in check_procs])
! 	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 -axo 'vsz comm'",[Verbatim command to execute for ps in check_vsz])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[Format string for scanning ps output in check_vsz])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'",[Verbatim command to execute for ps in check_rss])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
!   echo "      ps syntax... $PATH_TO_PS -axo 'stat comm vsz rss user ppid args'"
  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_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'stat user ppid args'",[Verbatim command to execute for ps in check_netsaint])
  	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'stat 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 -ao 'vsz comm'",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss comm'",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
!   echo "      ps syntax... $PATH_TO_PS -ao 'stat comm vsz rss user ppid args'"
! 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_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -eo 's user ppid args'",[Verbatim command to execute for ps in check_netsaint])
  	EXTRAS="$EXTRAS check_nagios"
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -eo 's 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 -eo 'vsz comm'",[])
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'",[])
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
          echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
! 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_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'",[Verbatim command to execute for ps in check_netsaint])
  	EXTRAS="$EXTRAS check_nagios"
- 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 's 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 -Ao 'vsz comm'",[])
- 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
- 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'",[])
- 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
  	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
! 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_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 -Ao 'status user ppid args'",[Verbatim command to execute for ps in check_netsaint])
! 	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao 'status 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 -Ao 'vsz comm'",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
  	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
! 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_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 -Ao 'state user ppid args'",[Verbatim command to execute for ps in check_netsaint])
! 	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Ao '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 -Ao 'vsz comm'",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -Ao 'rss comm'",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
  	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
  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_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 -ao 'state user ppid args'",[])
! 	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -ao 'state uid ppid command 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 -ao 'vsz command'",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -ao 'rss command'",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[])
  	echo "      ps syntax... $PATH_TO_PS -ao 'state command 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
  then
! 	AC_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %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 -el",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
  	echo "      ps syntax... $PATH_TO_PS -el"
  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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*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 -el",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[])
! 	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    
  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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %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 -el",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -el",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %d",[])
  	echo "      ps syntax... $PATH_TO_PS -el"
  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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[&procuid,&procppid,procstat,&pos,procprog],[])
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS glaxen",[])
! 	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 glaxen",[])
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %*s %*s %d",[])
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS glaxen",[])
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %*s %*s %d",[])
  	echo "      ps syntax... $PATH_TO_PS glaxen"
  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
  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 waxo 'state uid ppid ucomm 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 waxo 'state vsz rss 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_DEFINE(USE_PS_VARS,1,[Define if we use custom variable list for sscanf])
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,&pos,procprog],[])
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -Al",[])
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s",[Format string for scanning ps output in check_procs])
! 	if ps -Ao 'vsz comm' 2>/dev/null | egrep -i ["^ *VSZ +COMMAND"] >/dev/null
  	then
! 		AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -Ao 'vsz comm'",[])
! 		AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %d",[])
  	fi
  	echo "      ps syntax... $PATH_TO_PS -Al"
  else
! 	echo "** Unable to find usable ps syntax"
  fi
  
- dnl AC_ARG_WITH(df_command,--with-df-command=<syntax>,sets syntax for df,DF_COMMAND=$withval)
  AC_ARG_WITH(df_command,
  	ACX_HELP_STRING([--with-df-command=SYNTAX],
--- 548,876 ----
  fi
  
+ dnl #### Process table test
+ 
  AC_PATH_PROG(PATH_TO_PS,ps)
+ ac_cv_use_ps_vars=no
+ 
  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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -weo 'stat user ppid args'"
! 	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"
  	EXTRAS="$EXTRAS check_nagios"
!   	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_cv_use_ps_vars=yes
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS waxo 'state uid ppid command'"
! 	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"
! 	EXTRAS="$EXTRAS check_nagios"
  	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_cv_use_ps_vars=yes
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS waxno 'state user ppid comm'"
! 	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"
! 	EXTRAS="$EXTRAS check_nagios"
  	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
! 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
! 	ac_cv_ps_raw_command="$PATH_TO_PS laxnwww"
! 	ac_cv_ps_varlist="[&procuid,&procppid,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"
  	EXTRAS="$EXTRAS check_nagios"
  	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_cv_use_ps_vars=yes
! 	ac_cv_ps_raw_command="$PATH_TO_PS laxnwww"
! 	ac_cv_ps_varlist="[&procuid,&procppid,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 %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"
  	EXTRAS="$EXTRAS check_nagios"
  	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
! 	ac_cv_use_ps_vars=yes
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -axo 'stat user ppid args'"
! 	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"
  	EXTRAS="$EXTRAS check_nagios"
! 	echo "      ps syntax... $PATH_TO_PS -axo 'stat comm vsz rss user ppid args'"
! 
  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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -ao 'stat user ppid args'"
! 	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"
  	EXTRAS="$EXTRAS check_nagios"
! 	echo "      ps syntax... $PATH_TO_PS -ao 'stat comm vsz rss user ppid args'"
! 
! 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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -eo 's user ppid args'"
! 	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"
  	EXTRAS="$EXTRAS check_nagios"
          echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
! 
! 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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -Ao 's user ppid args'"
! 	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"
  	EXTRAS="$EXTRAS check_nagios"
  	echo "      ps syntax... $PATH_TO_PS -Ao 's comm vsz rss'"
! 
! 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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -Ao 'status user ppid args'"
! 	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"
! 	EXTRAS="$EXTRAS check_nagios"
  	echo "      ps syntax... $PATH_TO_PS -Ao 'status comm vsz rss'"
! 
! 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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -Ao 'state user ppid args'"
! 	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"
! 	EXTRAS="$EXTRAS check_nagios"
  	echo "      ps syntax... $PATH_TO_PS -Ao 'state comm vsz rss'"
+ 
  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
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS -ao 'state user ppid args'"
! 	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"
! 	EXTRAS="$EXTRAS check_nagios"
  	echo "      ps syntax... $PATH_TO_PS -ao 'state command 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
  then
! 	ac_cv_use_ps_vars=yes
! 	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 %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"
  	echo "      ps syntax... $PATH_TO_PS -el"
+ 
  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
! 	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"
  	echo "      ps syntax... $PATH_TO_PS -el"
! 
  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_use_ps_vars=yes
! 	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"
  	echo "      ps syntax... $PATH_TO_PS -el"
+ 
  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
! 	ac_cv_ps_varlist="[&procuid,&procppid,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"
  	echo "      ps syntax... $PATH_TO_PS glaxen"
+ 
  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
  then
! 	ac_cv_use_ps_vars=yes
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_raw_command="$PATH_TO_PS waxo 'state uid ppid command'"
! 	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"
! 	EXTRAS="$EXTRAS check_nagios"
  	echo "      ps syntax... $PATH_TO_PS waxo 'state vsz rss 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_use_ps_vars=yes
! 	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
  	echo "      ps syntax... $PATH_TO_PS -Al"
+ 
  else
! 	AC_MSG_WARN([unable to find usable ps syntax])
! fi
! 
! if test "x$ac_cv_use_ps_vars" != "xno"
! then
! 	AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
  fi
+ AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
+ 	[Variable list for sscanf of 'ps' output])
+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,$ac_cv_ps_raw_command,
+ 	[Verbatim command to execute for ps in check_netsaint])
+ 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_ARG_WITH(df_command,
  	ACX_HELP_STRING([--with-df-command=SYNTAX],
***************
*** 818,821 ****
--- 880,884 ----
  then
  	AC_DEFINE_UNQUOTED(DF_COMMAND,"$DF_COMMAND",[path and args for df command])
+ 
  elif df -Pk 2>/dev/null | egrep -i ["^(/dev/|[a-zA-Z]:)[a-z0-9/\\]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/\\]*"] >/dev/null
  then
***************
*** 823,826 ****
--- 886,890 ----
  	AC_MSG_RESULT([      df syntax... $PATH_TO_DF -Pk])
  	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF -Pk",[path and args for df command])
+ 
  elif df -k 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
  then
***************
*** 828,831 ****
--- 892,896 ----
  	AC_MSG_RESULT([      df syntax... $PATH_TO_DF -k])
  	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF -k",[path and args for df command])
+ 
  elif df 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
  then
***************
*** 833,836 ****
--- 898,902 ----
  	AC_MSG_RESULT([      df syntax... $PATH_TO_DF])
  	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF",[path and args for df command])
+ 
  elif bdf 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
  then
***************
*** 838,904 ****
  	AC_MSG_RESULT([      df syntax... $PATH_TO_DF])
  	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF",[path and args for df command])
  else
! 	AC_MSG_WARN("unable to find usable df syntax")
  fi
  
  AC_PATH_PROG(PATH_TO_PING,ping)
  
- dnl AC_ARG_WITH(ping_command,--with-ping-command=<syntax> sets syntax for ping,PING_COMMAND=$withval)
  AC_ARG_WITH(ping_command,
  	ACX_HELP_STRING([--with-ping-command=SYNTAX],
! 		[sets syntax for ping]),
! 	PING_COMMAND=$withval,)
! if test -n "$PING_COMMAND"
  then
! 	echo "      ping syntax... (command-line) $PING_COMMAND"
  	if test -n "$PING_PACKETS_FIRST"
  	then
! 		AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
  	fi
! elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && ping -n -s 127.0.0.1 56 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
! then
!         PING_COMMAND="$PATH_TO_PING -n -U -c %d %s"
!         AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
!         echo "      ping syntax... $PATH_TO_PING -n -U -c <count> <host>"
! elif ping -n -U -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
! then
!         PING_COMMAND="$PATH_TO_PING -n -U -c %d %s"
!         AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
!         echo "      ping syntax... $PATH_TO_PING -n -U -c <count> <host>"
! elif ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
! then
! 	PING_COMMAND="$PATH_TO_PING -n -c %d %s"
! 	AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
  	echo "      ping syntax... $PATH_TO_PING -n -c <count> <host>"
! elif ping -n 127.0.0.1 -c 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	PING_COMMAND="$PATH_TO_PING -n %s -c %d"
  	echo "      ping syntax... $PATH_TO_PING -n <host> -c <count>"
! elif ping 127.0.0.1 -n 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	PING_COMMAND="$PATH_TO_PING %s -n %d"
  	echo "      ping syntax... $PATH_TO_PING <host> -n <count>"
! elif ping -n -s 127.0.0.1 56 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	PING_COMMAND="$PATH_TO_PING -n -s %s 56 %d"
  	echo "      ping syntax... $PATH_TO_PING -n -s <host> 56 <count>"
! elif ping -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	PING_COMMAND="$PATH_TO_PING -n -h %s -s 56 -c %d"
  	echo "      ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>"
! elif ping -n -s 56 -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	PING_COMMAND="$PATH_TO_PING -n -s 56 -c %d %s"
! 	AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
  	echo "      ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>"
! elif ping -n -c 1 127.0.0.1 2>/dev/null | egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	PING_COMMAND="$PATH_TO_PING -n -c %d %s"
! 	AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
  	echo "      ping syntax... $PATH_TO_PING -n -c <count> <host>"
  else
! 	AC_MSG_WARN("unable to find usable ping syntax")
  fi
! AC_DEFINE_UNQUOTED(PING_COMMAND,"$PING_COMMAND",[path and args for ping command])
  
  AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
--- 904,1005 ----
  	AC_MSG_RESULT([      df syntax... $PATH_TO_DF])
  	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF",[path and args for df command])
+ 
  else
! 	AC_MSG_WARN([unable to find usable df syntax])
  fi
  
  AC_PATH_PROG(PATH_TO_PING,ping)
+ AC_PATH_PROG(PATH_TO_PING6,ping6)
  
  AC_ARG_WITH(ping_command,
  	ACX_HELP_STRING([--with-ping-command=SYNTAX],
! 		[sets syntax for ICMP ping]),
! 	ac_cv_ping_command=$withval,)
! 
! if test -n "$ac_cv_ping_command"
  then
! 	echo "      ping syntax... (command-line) $ac_cv_ping_command"
  	if test -n "$PING_PACKETS_FIRST"
  	then
! 		AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
! 			[Define if packet count must precede host])
  	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
!         ac_cv_ping_command="$PATH_TO_PING -n -U -c %d %s"
!         dnl AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
! 	dnl	[Define if packet count must precede host])
!         echo "      ping syntax... ping -n -U -c <count> <host>"
! 
! elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
! then
!         ac_cv_ping_command="$PATH_TO_PING -n -U -c %d %s"
!         dnl AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
! 	dnl	[Define if packet count must precede host])
!         echo "      ping syntax... ping -n -U -c <count> <host>"
! 
! elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
! then
! 	ac_cv_ping_command="$PATH_TO_PING -n -c %d %s"
! 	dnl AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
! 	dnl	[Define if packet count must precede host])
  	echo "      ping syntax... $PATH_TO_PING -n -c <count> <host>"
! 
! elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	ac_cv_ping_command="$PATH_TO_PING -n %s -c %d"
  	echo "      ping syntax... $PATH_TO_PING -n <host> -c <count>"
! 
! elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	ac_cv_ping_command="$PATH_TO_PING %s -n %d"
  	echo "      ping syntax... $PATH_TO_PING <host> -n <count>"
! 
! elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	ac_cv_ping_command="$PATH_TO_PING -n -s %s 56 %d"
  	echo "      ping syntax... $PATH_TO_PING -n -s <host> 56 <count>"
! 
! 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
! 	ac_cv_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
  	echo "      ping syntax... $PATH_TO_PING -n -h <host> -s 56 -c <count>"
! 
! elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	ac_cv_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
! 	dnl AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
! 	dnl	[Define if packet count must precede host])
  	echo "      ping syntax... $PATH_TO_PING -n -s 56 -c <count> <host>"
! 
! elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
! 	egrep -i "^round-trip|^rtt" >/dev/null
  then
! 	ac_cv_ping_command="$PATH_TO_PING -n -c %d %s"
! 	dnl AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$ac_cv_ping_command",
! 	dnl	[Define if packet count must precede host])
  	echo "      ping syntax... $PATH_TO_PING -n -c <count> <host>"
+ 
  else
! 	AC_MSG_WARN([unable to find usable ping syntax])
  fi
! 
! AC_DEFINE_UNQUOTED(PING_COMMAND,"$ac_cv_ping_command",
! 	[path and args for ICMP ping command])
! 
! AC_ARG_WITH(ping6_command,
! 	ACX_HELP_STRING([--with-ping6-command=SYNTAX],
! 		[sets syntax for ICMPv6 ping]),
! 	PING6_COMMAND=$withval,)
  
  AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
***************
*** 930,933 ****
--- 1031,1035 ----
  AC_DEFINE_UNQUOTED(PATH_TO_RPCINFO,"$PATH_TO_RPCINFO",[path to rpcinfo binary])
  
+ M
  AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate)
  AC_PATH_PROGS(PATH_TO_NTPDC,ntpdc xntpdc)
***************
*** 938,942 ****
  	AC_DEFINE_UNQUOTED(PATH_TO_NTPDATE,"$PATH_TO_NTPDATE",[path to ntpdate binary])
  else
! 	echo "** Install NTP programs (http://www.ntp.org) if you want to monitor time synchronization"
  fi
  
--- 1040,1045 ----
  	AC_DEFINE_UNQUOTED(PATH_TO_NTPDATE,"$PATH_TO_NTPDATE",[path to ntpdate binary])
  else
! 	dnl echo "** Install NTP programs (http://www.ntp.org) if you want to monitor time synchronization"
! 	AC_MSG_WARN([Install NTP programs (http://www.ntp.org) if you want to monitor time synchronization])
  fi
  
***************
*** 946,950 ****
  	AC_DEFINE_UNQUOTED(PATH_TO_LMSTAT,"$PATH_TO_LMSTAT",[path to lmstat])
  else
! 	echo "** Get lmstat from Globetrotter Software to monitor flexlm licenses"
  fi
  
--- 1049,1054 ----
  	AC_DEFINE_UNQUOTED(PATH_TO_LMSTAT,"$PATH_TO_LMSTAT",[path to lmstat])
  else
! 	dnl echo "** Get lmstat from Globetrotter Software to monitor flexlm licenses"
! 	AC_MSG_WARN([Get lmstat from Globetrotter Software to monitor flexlm licenses])
  fi
  
***************
*** 954,958 ****
  	AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT",[path to smbclient binary])
  else
! 	echo "** Get smbclient from Samba.org to monitor SMB shares"
  fi
  
--- 1058,1063 ----
  	AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT",[path to smbclient binary])
  else
! 	dnl echo "** Get smbclient from Samba.org to monitor SMB shares"
! 	AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
  fi
  
***************
*** 972,976 ****
  	EXTRAS="$EXTRAS check_hpjd check_snmp"
  else
! 	echo "** Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins"
  fi
  
--- 1077,1082 ----
  	EXTRAS="$EXTRAS check_hpjd check_snmp"
  else
! 	dnl echo "** Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins"
! 	AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins])
  fi
  
***************
*** 985,990 ****
  	echo "Found Net::SNMP perl module"
  else
! 	echo "** Tried $PERL - install Net::SNMP perl module if you want to"
! 	echo "        use the perl snmp plugins"
  fi
  
--- 1091,1097 ----
  	echo "Found Net::SNMP perl module"
  else
! 	dnl echo "** Tried $PERL - install Net::SNMP perl module if you want to"
! 	dnl echo "        use the perl snmp plugins"
! 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
  fi
  
***************
*** 1000,1004 ****
  	EXTRAS="$EXTRAS check_game"
  else
! 	echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
  fi
  
--- 1107,1112 ----
  	EXTRAS="$EXTRAS check_game"
  else
! 	dnl echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
! 	AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin])
  fi
  
***************
*** 1009,1013 ****
  	EXTRAS="$EXTRAS check_fping"
  else
! 	echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
  fi
  
--- 1117,1122 ----
  	EXTRAS="$EXTRAS check_fping"
  else
! 	dnl echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
! 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
  fi
  
***************
*** 1018,1022 ****
  	EXTRAS="$EXTRAS check_by_ssh"
  else
! 	echo "** Get ssh in order to make check_by_ssh plugin"
  fi
  
--- 1127,1132 ----
  	EXTRAS="$EXTRAS check_by_ssh"
  else
! 	dnl echo "** Get ssh in order to make check_by_ssh plugin"
! 	AC_MSG_WARN([Get ssh in order to make check_by_ssh plugin])
  fi
  
***************
*** 1027,1031 ****
  	AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq])
  else
! 	echo "** Could not find mailq or eqivalent"
  fi
  
--- 1137,1142 ----
  	AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq])
  else
! 	dnl echo "** Could not find mailq or eqivalent"
! 	AC_MSG_WARN([Could not find mailq or eqivalent])
  fi
  





More information about the Commits mailing list