[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.97,1.98

[Ton Voon]

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

Modified Files:
	configure.in 
Log Message:
Support for check_swap in AIX (tested on 5.1)


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** configure.in	16 Sep 2003 14:14:53 -0000	1.97
--- configure.in	17 Sep 2003 09:31:56 -0000	1.98
***************
*** 1264,1284 ****
  dnl available.
  AC_PATH_PROG(PATH_TO_SWAP,swap)
! AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
! 
! dnl dunno why this does not work below - use hack (kbd)
! dnl fine on linux, broken on solaris
! dnl if /bin/test -e "/proc/meminfo"
! AC_MSG_CHECKING(for how to check memory)
! if [cat /proc/meminfo > /dev/null 2>&1]
! then
! 	AC_MSG_RESULT([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])
! 	EXTRAS="$EXTRAS check_swap"
! fi
! 
! if ( test -n "$PATH_TO_SWAP" || test -n "$PATH_TO_SWAPINFO" )
  then
! 
  if [$PATH_TO_SWAP -l 2>&1 >/dev/null]
  then
--- 1264,1270 ----
  dnl available.
  AC_PATH_PROG(PATH_TO_SWAP,swap)
! if (test -n "$PATH_TO_SWAP")
  then
! AC_MSG_CHECKING([for $PATH_TO_SWAP format])
  if [$PATH_TO_SWAP -l 2>&1 >/dev/null]
  then
***************
*** 1307,1312 ****
  	fi
  	EXTRAS="$EXTRAS check_swap"
  
! elif [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
  then
  	ac_cv_have_swap=yes
--- 1293,1305 ----
  	fi
  	EXTRAS="$EXTRAS check_swap"
+ fi
+ dnl end if for PATH_TO_SWAP
+ fi
  
! AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
! if (test -n "$PATH_TO_SWAPINFO")
! then
! AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
! if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
  then
  	ac_cv_have_swap=yes
***************
*** 1329,1332 ****
--- 1322,1342 ----
  	AC_MSG_RESULT([using HP-UX format swapinfo])
  fi
+ dnl end if for PATH_TO_SWAPINFO
+ fi
+ 
+ AC_PATH_PROG(PATH_TO_LSPS,lsps)
+ if (test -n "$PATH_TO_LSPS")
+ then
+ AC_MSG_CHECKING([for $PATH_TO_LSPS format])
+ if [$PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null]
+ then
+ 	ac_cv_have_swap=yes
+ 	ac_cv_swap_command="$PATH_TO_LSPS -a"
+ 	ac_cv_swap_format=["%*s %*s %*s %d%*s %d %*s"]
+ 	ac_cv_swap_conv=1
+ 	AC_MSG_RESULT([using AIX lsps])
+ fi
+ dnl end if for PATH_TO_SWAPINFO
+ fi
  
  if test "x$ac_cv_have_swap" != "x" 
***************
*** 1344,1349 ****
  fi
  
! dnl End of if SWAP
! fi 
  
  AC_PATH_PROG(PATH_TO_DIG,dig)
--- 1354,1370 ----
  fi
  
! dnl dunno why this does not work below - use hack (kbd)
! dnl fine on linux, broken on solaris
! dnl if /bin/test -e "/proc/meminfo"
! AC_MSG_CHECKING([for /proc/meminfo])
! if [cat /proc/meminfo > /dev/null 2>&1]
! then
! 	AC_MSG_RESULT([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])
! 	EXTRAS="$EXTRAS check_swap"
! else
! 	AC_MSG_RESULT([no])
! fi
  
  AC_PATH_PROG(PATH_TO_DIG,dig)