[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.41,1.42

Karl DeBisschop kdebisschop at users.sourceforge.net
Mon Feb 17 21:39:11 CET 2003


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

Modified Files:
	configure.in 
Log Message:
remainder of ps fix for UnixWare, and move [] in if/elif to indicate m4 quoting instead of test invocation

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** configure.in	18 Feb 2003 03:17:37 -0000	1.41
--- configure.in	18 Feb 2003 05:38:28 -0000	1.42
***************
*** 411,415 ****
  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])
--- 411,415 ----
  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])
***************
*** 425,429 ****
    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])
--- 425,429 ----
    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])
***************
*** 439,443 ****
  	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])
--- 439,443 ----
  	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])
***************
*** 455,459 ****
  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])
--- 455,459 ----
  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])
***************
*** 472,476 ****
  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])
--- 472,476 ----
  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])
***************
*** 486,490 ****
  	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])
--- 486,490 ----
  	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])
***************
*** 500,504 ****
    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])
--- 500,504 ----
    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])
***************
*** 513,517 ****
  	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])
--- 513,517 ----
  	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])
***************
*** 526,530 ****
  	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])
--- 526,530 ----
  	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])
***************
*** 539,543 ****
  	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])
--- 539,543 ----
  	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])
***************
*** 552,556 ****
  	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])
--- 552,556 ----
  	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])
***************
*** 566,570 ****
  	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])
--- 566,570 ----
  	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])
***************
*** 580,584 ****
  	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])
--- 580,584 ----
  	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])
***************
*** 592,596 ****
  	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])
--- 592,596 ----
  	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])
***************
*** 607,611 ****
  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])
--- 607,611 ----
  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])
***************
*** 619,623 ****
  	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])
--- 619,623 ----
  	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])
***************
*** 634,638 ****
  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])
--- 634,638 ----
  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])
***************
*** 647,650 ****
--- 647,663 ----
  	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"
***************
*** 655,677 ****
  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
--- 668,690 ----
  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
***************
*** 689,729 ****
  		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"
--- 702,742 ----
  		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"
***************
*** 738,753 ****
  if test -n "$ac_cv_path_PATH_TO_NSLOOKUP"
  then
! 	AC_MSG_CHECKING("nslookup syntax")
! 	if [nslookup -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null]
  	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"
  else
! 	AC_MSG_WARN("nslookup command not found")
  fi
  
--- 751,765 ----
  if test -n "$ac_cv_path_PATH_TO_NSLOOKUP"
  then
! 	if nslookup -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
  	then
! 		AC_MSG_RESULT([      nslookup syntax... $PATH_TO_NSLOOKUP])
  		AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP",[path and args for nslookup])
  	else
! 		AC_MSG_RESULT([      nslookup syntax... $PATH_TO_NSLOOKUP -sil])
  		AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP -sil",[path and args for nslookup])
  	fi
  	EXTRAS="$EXTRAS check_dns"
  else
! 	AC_MSG_WARN([nslookup command not found])
  fi
  
***************
*** 755,767 ****
  if test -n "$ac_cv_path_PATH_TO_HOST"
  then
- 	AC_MSG_CHECKING("host syntax")
- 	if [host 127.0.0.1 2>&1 | grep -v "ommand not found" > /dev/null]
- 	then
- 		AC_MSG_RESULT("$PATH_TO_HOST")
- 		AC_DEFINE_UNQUOTED(HOST_COMMAND,"$PATH_TO_HOST",[path to host binary])
- 	fi
  	EXTRAS="$EXTRAS check_dns"
- else	
- 	AC_MSG_WARN("host command not found")
  fi
  
--- 767,771 ----





More information about the Commits mailing list