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

[Subhendu Ghosh]

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

Modified Files:
	configure.in 
Log Message:
regex fix to catch *BSD swapinfo and not HP-UX error and memory/file swap in addition to device for HP-UX

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** configure.in	17 Feb 2003 22:01:03 -0000	1.40
--- configure.in	18 Feb 2003 03:17:37 -0000	1.41
***************
*** 872,875 ****
--- 872,879 ----
  fi
  
+ dnl SWAP info required is amount allocated/available and amount free
+ dnl The plugin works through all the swap devices and adds up the total swap
+ dnl available.
+ 
  dnl dunno why this does not work below - use hack (kbd)
  dnl fine on linux, broken on solaris
***************
*** 902,906 ****
  	fi
  	EXTRAS="$EXTRAS check_swap"
! elif [swapinfo -k 2>&1 | egrep -i "Device" >/dev/null]
  then
  	echo "found swapinfo command"
--- 906,910 ----
  	fi
  	EXTRAS="$EXTRAS check_swap"
! elif [swapinfo -k 2>&1 | egrep -i "^Device" >/dev/null]
  then
  	echo "found swapinfo command"
***************
*** 914,922 ****
  	fi
  	EXTRAS="$EXTRAS check_swap"
! elif [swapinfo -d 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
  then
  	AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
  	AC_PATH_PROG(PATH_TO_SWAP,swapinfo)
! 	AC_DEFINE_UNQUOTED(SWAP_COMMAND,"/bin/sh '$PATH_TO_SWAP -d | /bin/tail -l +2'",[Path to swap/swapinfo binary, with any args])
  	AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"],[Format string for parsing swap output ])
  	echo "        using HP-UX format HP-UX"
--- 918,926 ----
  	fi
  	EXTRAS="$EXTRAS check_swap"
! elif [swapinfo -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
  then
  	AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
  	AC_PATH_PROG(PATH_TO_SWAP,swapinfo)
! 	AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$PATH_TO_SWAP -dfM",[Path to swap/swapinfo binary, with any args])
  	AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"],[Format string for parsing swap output ])
  	echo "        using HP-UX format HP-UX"