X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.in;h=81b019b72e09677630267d7ab5491ebe659c279f;hb=825a7322b131a16819b0cacccc186b86fffc57eb;hp=24f66d203a6ea77db4615fc07194b3cd2f310d0f;hpb=704b1e2dca00007d7310c129e29e708107e12f1d;p=nagiosplug.git diff --git a/configure.in b/configure.in index 24f66d2..81b019b 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_REVISION ($Revision$) +AC_PREREQ(2.50) AC_INIT(Helper.pm) VER=1.3.99 REL=1 @@ -30,31 +31,6 @@ AC_MINIX AC_PROG_MAKE_SET AC_PROG_AWK -# Check for SunOS statfs brokenness wrt partitions 2GB and larger. -# If exists and struct statfs has a member named f_spare, -# enable the work-around code in fsusage.c. -AC_MSG_CHECKING([for statfs that truncates block counts]) -AC_CACHE_VAL(fu_cv_sys_truncating_statfs, -[AC_TRY_COMPILE([ -#if !defined(sun) && !defined(__sun) -choke -- this is a workaround for a Sun-specific problem -#endif -#include -#include ], -[struct statfs t; long c = *(t.f_spare);], -fu_cv_sys_truncating_statfs=yes -AC_MSG_RESULT(yes), -fu_cv_sys_truncating_statfs=no -AC_MSG_RESULT(no), -)]) -if test $fu_cv_sys_truncating_statfs = yes; then - AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, -[ Define if the block counts reported by statfs may be truncated to 2GB - and the correct values may be stored in the f_spare array. - (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. - SunOS 4.1.1 seems not to be affected.)]) -fi - saved_srcdir=$srcdir srcdir=$srcdir/lib test -f $srcdir/getloadavg.c \ @@ -66,11 +42,6 @@ ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD]) dnl AM_WITH_REGEX AC_PROG_RANLIB -AC_PATH_PROG(ACLOCAL,aclocal) -AC_PATH_PROG(AUTOMAKE,automake) -AC_PATH_PROG(AUTOCONF,autoconf) -AC_PATH_PROG(AUTOHEADER,autoheader) - PLUGIN_TEST=`echo $srcdir/plugins/t/*.t|sed -e 's,\.*/plugins/,,g'` AC_SUBST(PLUGIN_TEST)dnl @@ -80,7 +51,7 @@ AC_SUBST(SCRIPT_TEST)dnl WARRANTY="The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n" AC_SUBST(WARRANTY) -SUPPORT="Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net\n" +SUPPORT="Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net\nPlease include version information with all correspondence. (when possible, use output from the --version option of the plugin itself)." AC_SUBST(SUPPORT) dnl CGIURL has changed for Nagios with 1.0 beta @@ -124,6 +95,14 @@ ac_cv_uname_s=`uname -s` ac_cv_uname_r=`uname -r` ac_cv_uname_v=`uname -v` +PKG_ARCH=`uname -p` +REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'` +REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'` + +AC_SUBST(PKG_ARCH) +AC_SUBST(REV_DATESTAMP) +AC_SUBST(REV_TIMESTAMP) + dnl Checks for programs. AC_PATH_PROG(PYTHON,python) AC_PATH_PROG(PERL,perl) @@ -300,9 +279,14 @@ AC_ARG_WITH(openssl, [sets path to openssl installation]), OPENSSL=$withval,) -dnl Check for AF_INET6 support +AC_CHECK_HEADERS(unistd.h) + +dnl Check for AF_INET6 support - unistd.h required for Darwin AC_CACHE_CHECK([for IPv6 support], with_ipv6, [ - AC_TRY_COMPILE([#include + AC_TRY_COMPILE([#ifdef HAVE_UNISTD_H + #include + #endif + #include #include ], [struct sockaddr_in6 sin6; void *p; @@ -482,21 +466,51 @@ dnl AC_HEADER_STDC AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(signal.h strings.h string.h syslog.h unistd.h uio.h errno.h regex.h sys/types.h sys/time.h sys/socket.h sys/loadavg.h) -AC_CHECK_HEADERS(stdarg.h sys/unistd.h unistd.h ctype.h stdlib.h) - -dnl Linux -AC_CHECK_HEADERS(sys/vfs.h, - [AC_TRY_COMPILE([#include ], - [struct statfs buf; long foo; statfs ("/", &buf); foo = buf.f_namelen;], - [AC_DEFINE(HAVE_STRUCT_STATFS,1,[Define if statfs struct can be found])])]) +AC_CHECK_HEADERS(signal.h strings.h string.h syslog.h uio.h errno.h regex.h sys/types.h sys/time.h sys/socket.h sys/loadavg.h) +AC_CHECK_HEADERS(stdarg.h sys/unistd.h ctype.h stdlib.h) +AC_CHECK_HEADERS(limits.h sys/param.h sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h fcntl.h sys/statfs.h sys/dustat.h sys/statvfs.h) + +# Define HAVE_INTTYPES_H if exists, +# doesn't clash with , and declares uintmax_t. + +AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, +[AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_inttypes_h=yes, + jm_ac_cv_header_inttypes_h=no)]) + +if test $jm_ac_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, +[Define if exists, doesn't clash with , + and declares uintmax_t. ]) +fi -dnl FreeBSD -AC_CHECK_HEADERS(sys/param.h sys/mount.h, - [AC_TRY_COMPILE([#include -#include ], - [struct statfs buf; int foo; statfs ("/", &buf); foo = buf.f_flags;], - [AC_DEFINE(HAVE_STRUCT_STATFS,1,[Define if statfs struct can be found])])]) +# Check for SunOS statfs brokenness wrt partitions 2GB and larger. +# If exists and struct statfs has a member named f_spare, +# enable the work-around code in fsusage.c. +AC_MSG_CHECKING([for statfs that truncates block counts]) +AC_CACHE_VAL(fu_cv_sys_truncating_statfs, +[AC_TRY_COMPILE([ +#if !defined(sun) && !defined(__sun) +choke -- this is a workaround for a Sun-specific problem +#endif +#include +#include ], +[struct statfs t; long c = *(t.f_spare);], +fu_cv_sys_truncating_statfs=yes +AC_MSG_RESULT(yes), +fu_cv_sys_truncating_statfs=no +AC_MSG_RESULT(no), +)]) +if test $fu_cv_sys_truncating_statfs = yes; then + AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, +[ Define if the block counts reported by statfs may be truncated to 2GB + and the correct values may be stored in the f_spare array. + (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. + SunOS 4.1.1 seems not to be affected.)]) +fi dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -603,22 +617,26 @@ fi dnl #### Process table test AC_PATH_PROG(PATH_TO_PS,ps) -ac_cv_use_ps_vars=no AC_MSG_CHECKING(for ps syntax) +dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo +dnl STAT UCOMM VSZ RSS USER PPID COMMAND +if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ + egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null +then + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" + EXTRAS="$EXTRAS check_nagios" + AC_MSG_RESULT([$ac_cv_ps_command]) + dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND -if ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ +elif ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -weo 'stat user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -weo 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -weo 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -626,15 +644,9 @@ dnl FreeBSD elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | \ egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS waxo 'state uid ppid command'" - ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid command command'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS waxco 'rss command'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -642,15 +654,9 @@ dnl BSD-like mode in RH 6.1 elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | \ egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS waxno 'state user ppid comm'" - ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS waxno 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS waxno 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -659,15 +665,9 @@ dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND elif ps -laxnwww 2>/dev/null | \ egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_raw_command="$PATH_TO_PS laxnwww" - ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]" + ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -laxnwww" - ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s" - ac_cv_vsz_command="$PATH_TO_PS laxnwww" - ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %*s %d" - ac_cv_rss_command="$PATH_TO_PS laxnwww" - ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %d" + ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -678,15 +678,9 @@ dnl elif ps laxnwww 2>/dev/null | \ egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_raw_command="$PATH_TO_PS laxnwww" - ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]" + ac_cv_ps_varlist="[&procuid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS laxnwww" - ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s" - ac_cv_vsz_command="$PATH_TO_PS laxnwww" - ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %d" - ac_cv_rss_command="$PATH_TO_PS laxnwww" - ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %d" + ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -694,15 +688,9 @@ dnl OpenBSD (needs to come early because -exo appears to work, but does not give elif ps -axo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -axo 'stat user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -axo 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -axo 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -710,75 +698,45 @@ dnl AIX 4.3.3 - needs verification. This works for Tru64 - needs %*[ +] in PS_FO elif ps -ao 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -ao 'stat user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid comm args'" - ac_cv_ps_format="[["%s%*[ +] %d %d %s %n"]]" - ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -ao 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="[["%s%*[ +] %d %d %d %d %f %s %n"]]" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \ egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -eo 's user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -eo 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -eo 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | \ egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -Ao 's user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \ egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -Ao 'status user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \ egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -Ao 'state user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid comm args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid vsz rss pcpu comm args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -786,15 +744,9 @@ dnl wonder who takes state instead of stat elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | \ egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS -ao 'state user ppid args'" - ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid command args'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz command'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS -ao 'rss command'" - ac_cv_rss_format="%d %s" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid vsz rss pcpu command args'" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -802,28 +754,18 @@ dnl IRIX 53 elif ps -el 2>/dev/null | \ egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" + ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -el" - ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - ac_cv_vsz_command="$PATH_TO_PS -el" - ac_cv_vsz_format="%*s %*s %*s %*s %d" - ac_cv_rss_command="$PATH_TO_PS -el" - ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d" + ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s" AC_MSG_RESULT([$ac_cv_ps_command]) dnl IRIX 63 elif ps -el 2>/dev/null | \ egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -el" ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - ac_cv_vsz_command="$PATH_TO_PS -el" - ac_cv_vsz_format="%*s %*s %*s %*s %d" - ac_cv_rss_command="$PATH_TO_PS -el" - ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d" AC_MSG_RESULT([$ac_cv_ps_command]) dnl AIX 4.1: @@ -832,46 +774,31 @@ dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 elif ps -el 2>/dev/null | \ egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null then - ac_cv_use_ps_vars=yes ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -el" ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - ac_cv_vsz_command="$PATH_TO_PS -el" - ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %d" - ac_cv_rss_command="$PATH_TO_PS -el" - ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %d" AC_MSG_RESULT([$ac_cv_ps_command]) dnl AIX? elif ps glaxen 2>/dev/null | \ egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]" + ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS glaxen" - ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s" - ac_cv_vsz_command="$PATH_TO_PS glaxen" - ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %d" - ac_cv_rss_command="$PATH_TO_PS glaxen" - ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %d" + ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s" AC_MSG_RESULT([$ac_cv_ps_command]) dnl MacOSX / Darwin dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT -dnl STAT VSZ RSS UID USER PPID UCOMM COMMAND -dnl Ss 1308 272 0 root 0 init /sbin/init -elif ps waxo 'state vsz rss uid user ppid ucomm command' 2>/dev/null | \ - egrep -i ["^STAT +VSZ +RSS +UID +USER +PPID +UCOMM +COMMAND"] >/dev/null +dnl Some truncation will happen in UCOMM column +dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND +dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon +elif ps wwaxo 'state vsz rss uid ppid pcpu ucomm command' 2>/dev/null | \ + egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null then - ac_cv_use_ps_vars=yes - ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" - ac_cv_ps_raw_command="$PATH_TO_PS waxo 'state uid ppid command'" - ac_cv_ps_command="$PATH_TO_PS waxo 'state uid ppid ucomm command'" - ac_cv_ps_format="%s %d %d %s %n" - ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'" - ac_cv_vsz_format="%d %s" - ac_cv_rss_command="$PATH_TO_PS waxco 'rss command'" - ac_cv_rss_format="%d %s" + ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid ppid pcpu ucomm command'" + ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procppid,&procpcpu,procprog,&pos]" + ac_cv_ps_format="%s %d %d %d %d %f %s %n" EXTRAS="$EXTRAS check_nagios" AC_MSG_RESULT([$ac_cv_ps_command]) @@ -879,42 +806,27 @@ dnl UnixWare elif ps -Al 2>/dev/null | \ egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null then - ac_cv_use_ps_vars=yes ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -Al" ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" - if ps -Ao 'vsz comm' 2>/dev/null | \ - egrep -i ["^ *VSZ +COMMAND"] >/dev/null - then - ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" - ac_cv_vsz_format="%*s %d" - fi + #if ps -Ao 'vsz comm' 2>/dev/null | \ + # egrep -i ["^ *VSZ +COMMAND"] >/dev/null + #then + # ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" + # ac_cv_vsz_format="%*s %d" + #fi AC_MSG_RESULT([$ac_cv_ps_command]) else AC_MSG_WARN([unable to find usable ps syntax]) fi -if test "x$ac_cv_use_ps_vars" != "xno" -then - AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf]) -fi AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist, [Variable list for sscanf of 'ps' output]) -AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$ac_cv_ps_raw_command", - [Verbatim command to execute for ps in check_netsaint]) AC_DEFINE_UNQUOTED(PS_COMMAND,"$ac_cv_ps_command", [Verbatim command to execute for ps in check_procs]) AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format", [Format string for scanning ps output in check_procs]) -AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$ac_cv_vsz_command", - [Verbatim command to execute for ps in check_vsz]) -AC_DEFINE_UNQUOTED(VSZ_FORMAT,"$ac_cv_vsz_format", - [Format string for scanning ps output in check_vsz]) -AC_DEFINE_UNQUOTED(RSS_COMMAND,"$ac_cv_rss_command", - [Verbatim command to execute for ps in check_rss]) -AC_DEFINE_UNQUOTED(RSS_FORMAT,"$ac_cv_rss_format", - [Format string for scanning ps output in check_rss]) AC_PATH_PROG(PATH_TO_DF,df) AC_PATH_PROG(PATH_TO_BDF,bdf) @@ -955,6 +867,11 @@ 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]) +jm_FSTYPENAME +jm_FILE_SYSTEM_USAGE([space=yes], [space=no]) + AC_PATH_PROG(PATH_TO_PING,ping) AC_PATH_PROG(PATH_TO_PING6,ping6) @@ -1352,6 +1269,14 @@ else AC_MSG_WARN([Could not find mailq or eqivalent]) fi +AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat) +if test -x "$PATH_TO_QMAIL_QSTAT" +then + AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_QMAIL_QSTAT",[path to qmail-qstat]) +else + AC_MSG_WARN([Could not find qmail-qstat or eqivalent]) +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. @@ -1380,16 +1305,19 @@ then >/dev/null] then ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %d %d"] + ac_cv_swap_conv=2048 AC_MSG_RESULT([using IRIX format swap]) elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^swapfile +dev +swaplo +blocks +free" >/dev/null] then - ac_cv_swap_format=["%*s %*[[0-9,-]] %*d %d %d"] + ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"] + ac_cv_swap_conv=2048 AC_MSG_RESULT([using Solaris format swap]) elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^path +dev +swaplo +blocks +free" >/dev/null] then - ac_cv_swap_format=["%*s %*[[0-9,-]] %*d %d %d"] + ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"] + ac_cv_swap_conv=2048 AC_MSG_RESULT([using Unixware format swap]) fi @@ -1403,6 +1331,7 @@ then if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null] then ac_cv_swap_format=["%*s %d %*d %d"] + ac_cv_swap_conv=1024 AC_MSG_RESULT([using FreeBSD format swapinfo]) fi EXTRAS="$EXTRAS check_swap" @@ -1412,19 +1341,22 @@ then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM", ac_cv_swap_format=["%*s %d %*d %d"] + ac_cv_swap_conv=1024 AC_MSG_RESULT([using HP-UX format swapinfo]) fi -if test x$ac_cv_have_swap != x +if test "x$ac_cv_have_swap" != "x" then AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found]) fi -AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format", - [Format string for parsing swap output]) if test "x$ac_cv_swap_command" != "x" then AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command", [Path to swap/swapinfo binary, with any args]) + AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format", + [Format string for parsing swap output]) + AC_DEFINE_UNQUOTED(SWAP_CONVERSION,$ac_cv_swap_conv, + [Conversion factor to MB]) fi AC_PATH_PROG(PATH_TO_DIG,dig) @@ -1459,7 +1391,7 @@ AC_SUBST(DEPLIBS) AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}",[package version]) -AC_OUTPUT(Makefile subst lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl,PATH=.:..:$PATH subst.sh command.cfg) +AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo) ACX_FEATURE([with],[cgiurl]) ACX_FEATURE([with],[nagios-user])