summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2003-09-03 19:37:31 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2003-09-03 19:37:31 (GMT)
commit699d1f4188ad430fcbea445fe39bfb536fd731e5 (patch)
treef67be6213849f07dc65732a9df010549b7de356f
parent52106a56bac8438bf87346b55d736c02a8fa9872 (diff)
downloadmonitoring-plugins-699d1f4188ad430fcbea445fe39bfb536fd731e5.tar.gz
Remove df checks and ignore swap checks if no swap commands found
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@714 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--configure.in45
1 files changed, 6 insertions, 39 deletions
diff --git a/configure.in b/configure.in
index 39ca332..0fdd8f6 100644
--- a/configure.in
+++ b/configure.in
@@ -835,45 +835,6 @@ AC_DEFINE_UNQUOTED(PS_COMMAND,"$ac_cv_ps_command",
835AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format", 835AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format",
836 [Format string for scanning ps output in check_procs]) 836 [Format string for scanning ps output in check_procs])
837 837
838AC_PATH_PROG(PATH_TO_DF,df)
839AC_PATH_PROG(PATH_TO_BDF,bdf)
840
841AC_ARG_WITH(df_command,
842 ACX_HELP_STRING([--with-df-command=SYNTAX],
843 [sets syntax for df]),
844 with_df_command=$withval,)
845
846AC_MSG_CHECKING(for df syntax)
847if test -n "$with_df_command"
848then
849 AC_MSG_RESULT([$with_df_command])
850
851elif df -Pk 2>/dev/null | egrep -i ["^(/dev/|[a-zA-Z]:)[a-z0-9/\\]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/\\]*"] >/dev/null
852then
853 with_df_command="$PATH_TO_DF -Pk"
854 AC_MSG_RESULT([$with_df_command])
855
856elif df -k 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
857then
858 with_df_command="$PATH_TO_DF -k"
859 AC_MSG_RESULT([$with_df_command])
860
861elif df 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
862then
863 with_df_command="$PATH_TO_DF"
864 AC_MSG_RESULT([$with_df_command])
865
866elif bdf 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
867then
868 with_df_command="$PATH_TO_BDF"
869 AC_MSG_RESULT([$with_df_command])
870
871else
872 AC_MSG_WARN([unable to find usable df syntax])
873fi
874
875AC_DEFINE_UNQUOTED(DF_COMMAND,"$with_df_command",[path and args for df command])
876
877dnl jm_AFS 838dnl jm_AFS
878jm_LIST_MOUNTED_FILESYSTEMS([list_mounted_fs=yes], [list_mounted_fs=no]) 839jm_LIST_MOUNTED_FILESYSTEMS([list_mounted_fs=yes], [list_mounted_fs=no])
879jm_FSTYPENAME 840jm_FSTYPENAME
@@ -1295,6 +1256,9 @@ dnl if /bin/test -e "/proc/meminfo"
1295AC_PATH_PROG(PATH_TO_SWAP,swap) 1256AC_PATH_PROG(PATH_TO_SWAP,swap)
1296AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo) 1257AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
1297 1258
1259if ( test -n "$PATH_TO_SWAP" || test -n "$PATH_TO_SWAPINFO" )
1260then
1261
1298AC_MSG_CHECKING(for how to check memory) 1262AC_MSG_CHECKING(for how to check memory)
1299if [cat /proc/meminfo > /dev/null 2>&1] 1263if [cat /proc/meminfo > /dev/null 2>&1]
1300then 1264then
@@ -1366,6 +1330,9 @@ then
1366 [Conversion factor to MB]) 1330 [Conversion factor to MB])
1367fi 1331fi
1368 1332
1333dnl End of if SWAP
1334fi
1335
1369AC_PATH_PROG(PATH_TO_DIG,dig) 1336AC_PATH_PROG(PATH_TO_DIG,dig)
1370AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG",[Path to dig command, if present]) 1337AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG",[Path to dig command, if present])
1371if test -n "$PATH_TO_DIG"; then 1338if test -n "$PATH_TO_DIG"; then