[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.81,1.82

[Ton Voon]

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

Modified Files:
	configure.in 
Log Message:
Support for swap -s for solaris. Also changes size of swap to MBs through
a conversion amount in configure. Possible breakage on other OSes


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** configure.in	12 Jun 2003 04:16:34 -0000	1.81
--- configure.in	27 Jun 2003 14:43:01 -0000	1.82
***************
*** 1306,1309 ****
--- 1306,1310 ----
  	then
  		ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %d %d"]
+ 		ac_cv_swap_conv=2048
  		AC_MSG_RESULT([using IRIX format swap])
  
***************
*** 1311,1314 ****
--- 1312,1316 ----
  	then
  		ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"]
+ 		ac_cv_swap_conv=2048
  		AC_MSG_RESULT([using Solaris format swap])
  
***************
*** 1316,1319 ****
--- 1318,1322 ----
  	then
  		ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"]
+ 		ac_cv_swap_conv=2048
  		AC_MSG_RESULT([using Unixware format swap])
  
***************
*** 1329,1332 ****
--- 1332,1336 ----
  	then
  		ac_cv_swap_format=["%*s %d %*d %d"]
+ 		ac_cv_swap_conv=1024
  		AC_MSG_RESULT([using FreeBSD format swapinfo])
  	fi
***************
*** 1338,1354 ****
  	ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM",
  	ac_cv_swap_format=["%*s %d %*d %d"]
  	AC_MSG_RESULT([using HP-UX format swapinfo])
  fi
  
! if test x$ac_cv_have_swap != x 
  then
  	AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
  fi
- AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format",
- 	[Format string for parsing swap output])
  if test "x$ac_cv_swap_command" != "x" 
  then
  	AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command",
  		[Path to swap/swapinfo binary, with any args])
  fi
  
--- 1342,1361 ----
  	ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM",
  	ac_cv_swap_format=["%*s %d %*d %d"]
+ 	ac_cv_swap_conv=1024
  	AC_MSG_RESULT([using HP-UX format swapinfo])
  fi
  
! if test "x$ac_cv_have_swap" != "x" 
  then
  	AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
  fi
  if test "x$ac_cv_swap_command" != "x" 
  then
  	AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command",
  		[Path to swap/swapinfo binary, with any args])
+ 	AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format",
+ 		[Format string for parsing swap output])
+ 	AC_DEFINE_UNQUOTED(SWAP_CONVERSION,$ac_cv_swap_conv,
+ 		[Conversion factor to MB])
  fi