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

[Ton Voon]

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

Modified Files:
	configure.in 
Log Message:
Remove df checks and ignore swap checks if no swap commands found


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** configure.in	3 Sep 2003 10:32:52 -0000	1.94
--- configure.in	3 Sep 2003 19:37:31 -0000	1.95
***************
*** 836,878 ****
  	[Format string for scanning ps output in check_procs])
  
- AC_PATH_PROG(PATH_TO_DF,df)
- AC_PATH_PROG(PATH_TO_BDF,bdf)
- 
- AC_ARG_WITH(df_command,
- 	ACX_HELP_STRING([--with-df-command=SYNTAX],
- 		[sets syntax for df]),
- 	with_df_command=$withval,)
- 
- AC_MSG_CHECKING(for df syntax)
- if test -n "$with_df_command"
- then
- 	AC_MSG_RESULT([$with_df_command])
- 
- elif 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
- then
- 	with_df_command="$PATH_TO_DF -Pk"
- 	AC_MSG_RESULT([$with_df_command])
- 
- elif df -k 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
- then
- 	with_df_command="$PATH_TO_DF -k"
- 	AC_MSG_RESULT([$with_df_command])
- 
- elif df 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
- then
- 	with_df_command="$PATH_TO_DF"
- 	AC_MSG_RESULT([$with_df_command])
- 
- elif bdf 2>/dev/null | egrep -i ["^/dev/[a-z0-9/]+ +[0-9]+ +[0-9]+ +[0-9]+ +[0-9]+% +/[a-z0-9/]*"] >/dev/null
- then
- 	with_df_command="$PATH_TO_BDF"
- 	AC_MSG_RESULT([$with_df_command])
- 
- else
- 	AC_MSG_WARN([unable to find usable df syntax])
- fi
- 
- AC_DEFINE_UNQUOTED(DF_COMMAND,"$with_df_command",[path and args for df command])
- 
  dnl jm_AFS
  jm_LIST_MOUNTED_FILESYSTEMS([list_mounted_fs=yes], [list_mounted_fs=no])
--- 836,839 ----
***************
*** 1296,1299 ****
--- 1257,1263 ----
  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]
***************
*** 1366,1369 ****
--- 1330,1336 ----
  		[Conversion factor to MB])
  fi
+ 
+ dnl End of if SWAP
+ fi 
  
  AC_PATH_PROG(PATH_TO_DIG,dig)