From 4b94b86bb9ddc521e8c61d50f90093a4e7b9f246 Mon Sep 17 00:00:00 2001 From: Karl DeBisschop Date: Thu, 11 Sep 2003 08:02:04 +0000 Subject: last changes to configure broke check_swap on RHLinux. Restore /proc/meminfo check and make check_swap ifdefs safer git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@716 f882894a-f735-0410-b71e-b25c423dba1c --- configure.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0fdd8f63..37baafa8 100644 --- a/configure.in +++ b/configure.in @@ -1248,17 +1248,12 @@ 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. +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_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] then @@ -1266,8 +1261,12 @@ then 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 -elif [$PATH_TO_SWAP -l 2>&1 >/dev/null] +if [$PATH_TO_SWAP -l 2>&1 >/dev/null] then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAP -l" -- cgit v1.2.3-74-g34f1