[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.4,1.5

[Subhendu Ghosh]

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

Modified Files:
	configure.in 
Log Message:
typo, AIX 4.3 ps, smbclient, Net::SNMP fixes

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** configure.in	10 May 2002 03:49:22 -0000	1.4
--- configure.in	27 May 2002 02:03:37 -0000	1.5
***************
*** 38,42 ****
  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))
  
! AC_ARG_WITH(cgiurl,--with-cgiurl=<dir> sets URL for cgi programs,cgiurl=$withval,cgiurl=/cgi-bin/nagios)
  CGIURL="$cgiurl"
  AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL")
--- 38,43 ----
  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)
  CGIURL="$cgiurl"
  AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL")
***************
*** 53,57 ****
  
  EXTRAS=
! PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH
  
  LDFLAGS="$LDFLAGS -L."
--- 54,58 ----
  
  EXTRAS=
! dnl PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH
  
  LDFLAGS="$LDFLAGS -L."
***************
*** 315,319 ****
  	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axo 'rss comm'")
  	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
!   echo "      ps syntax... $PATH_TO_PS -eo '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
--- 316,334 ----
  	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
***************
*** 368,371 ****
--- 383,387 ----
  	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
***************
*** 651,654 ****
--- 667,679 ----
  fi
  
+ AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient)
+ 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"
+ fi
+ 
+ 
  AC_PATH_PROG(PATH_TO_WHO,who)
  if [who -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null]
***************
*** 674,678 ****
  fi
  
! if ( $PERL -MNet::SNMP -e 'print $Net::SNMP::VERSION;'  )
  then
  	echo "Found Net::SNMP perl module"
--- 699,703 ----
  fi
  
! if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
  then
  	echo "Found Net::SNMP perl module"