[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.12,1.13 missing,1.1.1.1,1.2

Karl DeBisschop kdebisschop at users.sourceforge.net
Wed Oct 16 14:32:08 CEST 2002


Update of /cvsroot/nagiosplug/nagiosplug
In directory usw-pr-cvs1:/tmp/cvs-serv28294

Modified Files:
	configure.in missing 
Log Message:
build cleanly on RedHat 8.0

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** configure.in	16 Oct 2002 10:34:32 -0000	1.12
--- configure.in	16 Oct 2002 21:31:39 -0000	1.13
***************
*** 22,28 ****
  AC_PROG_AWK
  
! AC_FUNC_GETLOADAVG
  AC_FUNC_STRTOD
! AM_WITH_REGEX
  AC_PROG_RANLIB
  
--- 22,28 ----
  AC_PROG_AWK
  
! AC_FUNC_GETLOADAVG(plugins)
  AC_FUNC_STRTOD
! dnl AM_WITH_REGEX
  AC_PROG_RANLIB
  
***************
*** 44,51 ****
  AC_SUBST(SUPPORT)
  
- dnl AC_ARG_PROGRAM
- 
- dnl AC_ARG_WITH(nonposix_state_defs,--with-nonposix-state-defs uses POSIXLY incorrect states for netsaint < 0.0.7b2,,AC_DEFINE(POSIX_STATE_DEFS))
- 
  dnl CGIURL has changed for Nagios with 1.0 beta
  AC_ARG_WITH(cgiurl,--with-cgiurl=<dir> sets URL for cgi programs,cgiurl=$withval,cgiurl=/nagios/cgi-bin)
--- 44,47 ----
***************
*** 81,86 ****
  dnl
  
- AC_FUNC_GETLOADAVG(plugins)
- 
  AC_CHECK_LIB(dce,main,SOCKETLIBS="$SOCKETLIBS -ldce")
  AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
--- 77,80 ----
***************
*** 283,287 ****
  ac_cv_have_longlong=yes,ac_cv_have_longlong=no,ac_cv_have_longlong=cross)])
  if test x"$ac_cv_have_longlong" = x"yes"; then
!     AC_DEFINE(HAVE_LONGLONG)
  fi
  
--- 277,281 ----
  ac_cv_have_longlong=yes,ac_cv_have_longlong=no,ac_cv_have_longlong=cross)])
  if test x"$ac_cv_have_longlong" = x"yes"; then
!     AC_DEFINE(HAVE_LONGLONG,1,[Define if system has long long type])
  fi
  
***************
*** 294,298 ****
          ac_cv_compiler_supports_ll=yes,ac_cv_compiler_supports_ll=no)])
  if test x"$ac_cv_compiler_supports_ll" = x"yes"; then
!    AC_DEFINE(COMPILER_SUPPORTS_LL)
  fi
  AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE_VA_COPY,[
--- 288,292 ----
          ac_cv_compiler_supports_ll=yes,ac_cv_compiler_supports_ll=no)])
  if test x"$ac_cv_compiler_supports_ll" = x"yes"; then
!    AC_DEFINE(COMPILER_SUPPORTS_LL,1,[Define if compiler support long long])
  fi
  AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE_VA_COPY,[
***************
*** 301,305 ****
  ac_cv_HAVE_VA_COPY=yes,ac_cv_HAVE_VA_COPY=no)])
  if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then
!     AC_DEFINE(HAVE_VA_COPY)
  fi
  
--- 295,299 ----
  ac_cv_HAVE_VA_COPY=yes,ac_cv_HAVE_VA_COPY=no)])
  if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then
!     AC_DEFINE(HAVE_VA_COPY,1,[Define if system has va_copy])
  fi
  
***************
*** 331,335 ****
  ac_cv_HAVE_C99_VSNPRINTF=yes,ac_cv_HAVE_C99_VSNPRINTF=no,ac_cv_HAVE_C99_VSNPRINTF=cross)])
  if test x"$ac_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
!     AC_DEFINE(HAVE_C99_VSNPRINTF)
  fi
  
--- 325,329 ----
  ac_cv_HAVE_C99_VSNPRINTF=yes,ac_cv_HAVE_C99_VSNPRINTF=no,ac_cv_HAVE_C99_VSNPRINTF=cross)])
  if test x"$ac_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
!     AC_DEFINE(HAVE_C99_VSNPRINTF,1,[Define if system has C99 compatible vsnprintf])
  fi
  
***************
*** 370,374 ****
  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
  
--- 364,368 ----
  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
  
***************
*** 378,510 ****
  if [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)
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axo 'stat user ppid args'")
! 	EXTRAS="$EXTRAS check_nagios"
! 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axo 'stat uid ppid comm args'")
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
! 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axo 'vsz comm'")
! 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
! 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
! 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
    echo "      ps syntax... $PATH_TO_PS -axo 'stat comm vsz rss user ppid args'"
  dnl AIX 4.3.3 - needs verification.
  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)
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -ao 'stat user ppid args'")
  	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")
! 	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)
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -eo 's user ppid args'")
  	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")
! 	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)
! 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 's user ppid args'")
! 	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")
! 	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)
  	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos])
! 	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -Ao 'status user ppid args'")
  	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")
! 	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)
  	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 comm args'")
! 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
! 	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)
! 	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")
! 	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 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)
! 	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")
! 	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)
! 	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")
! 	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]
  then
! 	AC_DEFINE(USE_PS_VARS)
! 	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")
! 	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"
--- 372,504 ----
  if [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.
  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",[])
! 	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 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",[])
! 	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",[])
! 	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]
  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",[])
! 	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"
***************
*** 512,523 ****
  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)
! 	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")
! 	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 SunOS 4.1.3:
--- 506,517 ----
  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",[])
! 	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 SunOS 4.1.3:
***************
*** 526,539 ****
  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)
! 	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")
! 	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:
--- 520,533 ----
  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",[])
! 	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:
***************
*** 543,556 ****
  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)
! 	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")
! 	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    
--- 537,550 ----
  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",[])
! 	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    
***************
*** 560,604 ****
  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)
! 	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")
! 	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)
! 	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")
! 	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 ucb style?
- dnl elif [ps axun 2>/dev/null | egrep -i "^USER +PID +%CPU +%MEM +SIZE +RSS +TTY +STAT +START +TIME +COMMAND *$" >/dev/null]
- dnl then
- dnl 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS axun")
- dnl 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %*s %*s %*s %*s %*s %s %*s %*s %s")
- dnl 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS axun")
- dnl 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d")
- dnl 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS axun")
- dnl 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %d")
- dnl 	echo "      ps syntax... $PATH_TO_PS axun"
- dnl ucb style?
- dnl elif [ps axun 2>/dev/null | egrep -i "^USER +PID +%CPU +%MEM +SIZE +RSS +TTY +STAT +START +TIME +COMMAND" >/dev/null]
- dnl then
- dnl 	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS axun")
- dnl 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %*s %*s %*s %*s %*s %s %*s %*s %s")
- dnl 	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS axun")
- dnl 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%*s %*s %*s %*s %d")
- dnl 	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS axun")
- dnl 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%*s %*s %*s %*s %*s %d")
- dnl 	echo "      ps syntax... $PATH_TO_PS axun"
  else
  	echo "** Unable to find usable ps syntax"
--- 554,578 ----
  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",[])
! 	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",[])
! 	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"
  else
  	echo "** Unable to find usable ps syntax"
***************
*** 608,632 ****
  if test -n "$DF_COMMAND"
  then
! 	AC_DEFINE_UNQUOTED(DF_COMMAND,"$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
  	AC_PATH_PROG(PATH_TO_DF,df)
  	AC_MSG_RESULT("      df syntax... $PATH_TO_DF -Pk")
! 	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF -Pk")
  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
  	AC_PATH_PROG(PATH_TO_DF,df)
  	AC_MSG_RESULT("      df syntax... $PATH_TO_DF -k")
! 	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF -k")
  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
  	AC_PATH_PROG(PATH_TO_DF,df)
  	AC_MSG_RESULT("      df syntax... $PATH_TO_DF")
! 	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF")
  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
  	AC_PATH_PROG(PATH_TO_DF,bdf)
  	AC_MSG_RESULT("      df syntax... $PATH_TO_DF")
! 	AC_DEFINE_UNQUOTED(DF_COMMAND,"$PATH_TO_DF")
  else
  	AC_MSG_WARN("unable to find usable df syntax")
--- 582,606 ----
  if test -n "$DF_COMMAND"
  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
  	AC_PATH_PROG(PATH_TO_DF,df)
  	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
  	AC_PATH_PROG(PATH_TO_DF,df)
  	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
  	AC_PATH_PROG(PATH_TO_DF,df)
  	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
  	AC_PATH_PROG(PATH_TO_DF,bdf)
  	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")
***************
*** 641,655 ****
  	if test -n "$PING_PACKETS_FIRST"
  	then
! 		AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND")
  	fi
  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")
          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")
  	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]
--- 615,629 ----
  	if test -n "$PING_PACKETS_FIRST"
  	then
! 		AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND",[Define if packet count must precede host])
  	fi
  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]
***************
*** 672,686 ****
  then
  	PING_COMMAND="$PATH_TO_PING -n -s 56 -c %d %s"
! 	AC_DEFINE_UNQUOTED(PING_PACKETS_FIRST,"$PING_COMMAND")
  	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")
  	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")
  
  AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup)
--- 646,660 ----
  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)
***************
*** 691,698 ****
  	then
  		AC_MSG_RESULT("$PATH_TO_NSLOOKUP")
! 		AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP")
  	else
  		AC_MSG_RESULT("$PATH_TO_NSLOOKUP -sil")
! 		AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP -sil")
  	fi
  	EXTRAS="$EXTRAS check_dns"
--- 665,672 ----
  	then
  		AC_MSG_RESULT("$PATH_TO_NSLOOKUP")
! 		AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP",[path and args for nslookup])
  	else
  		AC_MSG_RESULT("$PATH_TO_NSLOOKUP -sil")
! 		AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP -sil",[path and args for nslookup])
  	fi
  	EXTRAS="$EXTRAS check_dns"
***************
*** 708,712 ****
  	then
  		AC_MSG_RESULT("$PATH_TO_HOST")
! 		AC_DEFINE_UNQUOTED(HOST_COMMAND,"$PATH_TO_HOST")
  	fi
  	EXTRAS="$EXTRAS check_dns"
--- 682,686 ----
  	then
  		AC_MSG_RESULT("$PATH_TO_HOST")
! 		AC_DEFINE_UNQUOTED(HOST_COMMAND,"$PATH_TO_HOST",[path to host binary])
  	fi
  	EXTRAS="$EXTRAS check_dns"
***************
*** 716,723 ****
  
  AC_PATH_PROG(PATH_TO_UPTIME,uptime)
! AC_DEFINE_UNQUOTED(PATH_TO_UPTIME,"$PATH_TO_UPTIME")
  
  AC_PATH_PROG(PATH_TO_RPCINFO,rpcinfo)
! AC_DEFINE_UNQUOTED(PATH_TO_RPCINFO,"$PATH_TO_RPCINFO")
  
  AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate)
--- 690,697 ----
  
  AC_PATH_PROG(PATH_TO_UPTIME,uptime)
! AC_DEFINE_UNQUOTED(PATH_TO_UPTIME,"$PATH_TO_UPTIME",[path to uptime binary])
  
  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)
***************
*** 725,730 ****
  if (test -x "$PATH_TO_NTPDATE" || test -x "$PATH_TO_NTPDC")
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_NTPDC,"$PATH_TO_NTPDC")
! 	AC_DEFINE_UNQUOTED(PATH_TO_NTPDATE,"$PATH_TO_NTPDATE")
  else
  	echo "** Install NTP programs (http://www.ntp.org) if you want to monitor time synchronization"
--- 699,704 ----
  if (test -x "$PATH_TO_NTPDATE" || test -x "$PATH_TO_NTPDC")
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_NTPDC,"$PATH_TO_NTPDC",[path to ntpdc binary])
! 	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"
***************
*** 734,738 ****
  if test -x "$PATH_TO_LMSTAT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_LMSTAT,"$PATH_TO_LMSTAT")
  else
  	echo "** Get lmstat from Globetrotter Software to monitor flexlm licenses"
--- 708,712 ----
  if test -x "$PATH_TO_LMSTAT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_LMSTAT,"$PATH_TO_LMSTAT",[path to lmstat])
  else
  	echo "** Get lmstat from Globetrotter Software to monitor flexlm licenses"
***************
*** 742,746 ****
  if test -x "$PATH_TO_SMBCLIENT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT")
  else
  	echo "** Get smbclient from Samba.org to monitor SMB shares"
--- 716,720 ----
  if test -x "$PATH_TO_SMBCLIENT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_SMBCLIENT,"$PATH_TO_SMBCLIENT",[path to smbclient binary])
  else
  	echo "** Get smbclient from Samba.org to monitor SMB shares"
***************
*** 751,757 ****
  if [who -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null]
  then
! 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO -q")
  else
! 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO")
  fi
  
--- 725,731 ----
  if [who -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null]
  then
! 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO -q",[path and arguments for invoking 'who'])
  else
! 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
  fi
  
***************
*** 759,763 ****
  if test -x "$PATH_TO_SNMPGET"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET")
  	EXTRAS="$EXTRAS check_hpjd check_snmp"
  else
--- 733,737 ----
  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
***************
*** 768,772 ****
  if test -x "$PATH_TO_SNMPGETNEXT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT")
  fi
  
--- 742,746 ----
  if test -x "$PATH_TO_SNMPGETNEXT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
  fi
  
***************
*** 783,791 ****
  if test -x "$PATH_TO_QUAKESTAT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$PATH_TO_QUAKESTAT")
  	EXTRAS="$EXTRAS check_game"
  elif test -x "$PATH_TO_QSTAT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$PATH_TO_QSTAT")
  	EXTRAS="$EXTRAS check_game"
  else
--- 757,765 ----
  if test -x "$PATH_TO_QUAKESTAT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$PATH_TO_QUAKESTAT",[path to qstat/quakestat])
  	EXTRAS="$EXTRAS check_game"
  elif test -x "$PATH_TO_QSTAT"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$PATH_TO_QSTAT",[path to qstat/quakestat])
  	EXTRAS="$EXTRAS check_game"
  else
***************
*** 796,800 ****
  if test -x "$PATH_TO_FPING"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING")
  	EXTRAS="$EXTRAS check_fping"
  else
--- 770,774 ----
  if test -x "$PATH_TO_FPING"
  then
! 	AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping])
  	EXTRAS="$EXTRAS check_fping"
  else
***************
*** 805,809 ****
  if test -x "$PATH_TO_SSH"
  then
! 	AC_DEFINE_UNQUOTED(SSH_COMMAND,"$PATH_TO_SSH")
  	EXTRAS="$EXTRAS check_by_ssh"
  else
--- 779,783 ----
  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
***************
*** 818,823 ****
  then
  	echo "found /proc/meminfo"
! 	AC_DEFINE(HAVE_PROC_MEMINFO)
! 	AC_DEFINE_UNQUOTED(PROC_MEMINFO,"/proc/meminfo")
  	EXTRAS="$EXTRAS check_swap"
  elif [swap -l 2>&1 | egrep -i "swapfile" >/dev/null]
--- 792,797 ----
  then
  	echo "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 or something)])
  	EXTRAS="$EXTRAS check_swap"
  elif [swap -l 2>&1 | egrep -i "swapfile" >/dev/null]

Index: missing
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/missing,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** missing	28 Feb 2002 06:42:53 -0000	1.1.1.1
--- missing	16 Oct 2002 21:31:39 -0000	1.2
***************
*** 1,6 ****
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997 Free Software Foundation, Inc.
! # Franc,ois Pinard <pinard at iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
--- 1,6 ----
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
! # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
***************
*** 19,22 ****
--- 19,27 ----
  # 02111-1307, USA.
  
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
  if test $# -eq 0; then
    echo 1>&2 "Try \`$0 --help' for more information"
***************
*** 24,27 ****
--- 29,53 ----
  fi
  
+ run=:
+ 
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+ if test -f configure.ac; then
+   configure_ac=configure.ac
+ else
+   configure_ac=configure.in
+ fi
+ 
+ case "$1" in
+ --run)
+   # Try to run requested program, and just exit if it succeeds.
+   run=
+   shift
+   "$@" && exit 0
+   ;;
+ esac
+ 
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
  case "$1" in
  
***************
*** 36,39 ****
--- 62,66 ----
    -h, --help      display this help and exit
    -v, --version   output version information and exit
+   --run           try to run the given command, and emulate it if it fails
  
  Supported PROGRAM values:
***************
*** 44,54 ****
    bison        create \`y.tab.[ch]', if possible, from existing .[ch]
    flex         create \`lex.yy.c', if possible, from existing .c
    lex          create \`lex.yy.c', if possible, from existing .c
    makeinfo     touch the output file
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
      ;;
  
    -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
!     echo "missing - GNU libit 0.0"
      ;;
  
--- 71,83 ----
    bison        create \`y.tab.[ch]', if possible, from existing .[ch]
    flex         create \`lex.yy.c', if possible, from existing .c
+   help2man     touch the output file
    lex          create \`lex.yy.c', if possible, from existing .c
    makeinfo     touch the output file
+   tar          try tar, gnutar, gtar, then tar without non-portable flags
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
      ;;
  
    -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
!     echo "missing 0.4 - GNU automake"
      ;;
  
***************
*** 59,66 ****
      ;;
  
!   aclocal)
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acinclude.m4' or \`configure.in'.  You might want
           to install the \`Automake' and \`Perl' packages.  Grab them from
           any GNU archive site."
--- 88,100 ----
      ;;
  
!   aclocal*)
!     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
!        # We have it, but it failed.
!        exit 1
!     fi
! 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
           to install the \`Automake' and \`Perl' packages.  Grab them from
           any GNU archive site."
***************
*** 69,75 ****
  
    autoconf)
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`configure.in'.  You might want to install the
           \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
           archive site."
--- 103,114 ----
  
    autoconf)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`${configure_ac}'.  You might want to install the
           \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
           archive site."
***************
*** 78,87 ****
  
    autoheader)
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acconfig.h' or \`configure.in'.  You might want
           to install the \`Autoconf' and \`GNU m4' packages.  Grab them
           from any GNU archive site."
!     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
      test -z "$files" && files="config.h"
      touch_files=
--- 117,131 ----
  
    autoheader)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
           to install the \`Autoconf' and \`GNU m4' packages.  Grab them
           from any GNU archive site."
!     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
      test -z "$files" && files="config.h"
      touch_files=
***************
*** 96,103 ****
      ;;
  
!   automake)
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
           You might want to install the \`Automake' and \`Perl' packages.
           Grab them from any GNU archive site."
--- 140,152 ----
      ;;
  
!   automake*)
!     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
!        # We have it, but it failed.
!        exit 1
!     fi
! 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
           You might want to install the \`Automake' and \`Perl' packages.
           Grab them from any GNU archive site."
***************
*** 107,110 ****
--- 156,187 ----
      ;;
  
+   autom4te)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
+     echo 1>&2 "\
+ WARNING: \`$1' is needed, and you do not seem to have it handy on your
+          system.  You might have modified some files without having the
+          proper tools for further handling them.
+          You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+          archive site."
+ 
+     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+     test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+     if test -f "$file"; then
+ 	touch $file
+     else
+ 	test -z "$file" || exec >$file
+ 	echo "#! /bin/sh"
+ 	echo "# Created by GNU Automake missing as a replacement of"
+ 	echo "#  $ $@"
+ 	echo "exit 0"
+ 	chmod +x $file
+ 	exit 1
+     fi
+     ;;
+ 
    bison|yacc)
      echo 1>&2 "\
***************
*** 160,164 ****
--- 237,271 ----
      ;;
  
+   help2man)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
+     echo 1>&2 "\
+ WARNING: \`$1' is missing on your system.  You should only need it if
+ 	 you modified a dependency of a manual page.  You may need the
+ 	 \`Help2man' package in order for those modifications to take
+ 	 effect.  You can get \`Help2man' from any GNU archive site."
+ 
+     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+     if test -z "$file"; then
+ 	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+     fi
+     if [ -f "$file" ]; then
+ 	touch $file
+     else
+ 	test -z "$file" || exec >$file
+ 	echo ".ab help2man is required to generate this page"
+ 	exit 1
+     fi
+     ;;
+ 
    makeinfo)
+     if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+        # We have makeinfo, but it failed.
+        exit 1
+     fi
+ 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
***************
*** 174,177 ****
--- 281,323 ----
      fi
      touch $file
+     ;;
+ 
+   tar)
+     shift
+     if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+     fi
+ 
+     # We have already tried tar in the generic part.
+     # Look for gnutar/gtar before invocation to avoid ugly error
+     # messages.
+     if (gnutar --version > /dev/null 2>&1); then
+        gnutar "$@" && exit 0
+     fi
+     if (gtar --version > /dev/null 2>&1); then
+        gtar "$@" && exit 0
+     fi
+     firstarg="$1"
+     if shift; then
+ 	case "$firstarg" in
+ 	*o*)
+ 	    firstarg=`echo "$firstarg" | sed s/o//`
+ 	    tar "$firstarg" "$@" && exit 0
+ 	    ;;
+ 	esac
+ 	case "$firstarg" in
+ 	*h*)
+ 	    firstarg=`echo "$firstarg" | sed s/h//`
+ 	    tar "$firstarg" "$@" && exit 0
+ 	    ;;
+ 	esac
+     fi
+ 
+     echo 1>&2 "\
+ WARNING: I can't seem to be able to run \`tar' with the given arguments.
+          You may want to install GNU tar or Free paxutils, or check the
+          command line arguments."
+     exit 1
      ;;
  





More information about the Commits mailing list