[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.95,1.96

[Karl DeBisschop]

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

Modified Files:
	configure.in 
Log Message:
last changes to configure broke check_swap on RHLinux. Restore /proc/meminfo check and make check_swap ifdefs safer

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** configure.in	3 Sep 2003 19:37:31 -0000	1.95
--- configure.in	11 Sep 2003 08:02:04 -0000	1.96
***************
*** 1249,1263 ****
  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
  dnl if /bin/test -e "/proc/meminfo"
- 
- AC_PATH_PROG(PATH_TO_SWAP,swap)
- AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
- 
- if ( test -n "$PATH_TO_SWAP" || test -n "$PATH_TO_SWAPINFO" )
- then
- 
  AC_MSG_CHECKING(for how to check memory)
  if [cat /proc/meminfo > /dev/null 2>&1]
--- 1249,1258 ----
  dnl The plugin works through all the swap devices and adds up the total swap
  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]
***************
*** 1267,1272 ****
  	AC_DEFINE_UNQUOTED(PROC_MEMINFO,"/proc/meminfo",[path to /proc/meminfo if name changes])
  	EXTRAS="$EXTRAS check_swap"
  
! elif [$PATH_TO_SWAP -l 2>&1 >/dev/null]
  then
  	ac_cv_have_swap=yes
--- 1262,1271 ----
  	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
  	ac_cv_have_swap=yes