![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.in b/configure.in
index 9d3c2edd6492ba050348b9db01a1760a2e86fc07..2a0120f5614dc46eb91bcb41fdc913413042408c 100644 (file)
--- a/configure.in
+++ b/configure.in
PACKAGE_RELEASE="${REL}"
AC_SUBST(PACKAGE_RELEASE)
AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
-AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
+AM_CONFIG_HEADER(plugins/config.h)
AC_CANONICAL_HOST
AC_PREFIX_DEFAULT(/usr/local/nagios)
AC_PROG_MAKE_SET
AC_PROG_AWK
-# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
-# If <sys/vfs.h> 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 <sys/types.h>
-#include <sys/vfs.h>],
-[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 \
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
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
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)
[sets path to openssl installation]),
OPENSSL=$withval,)
-AC_ARG_WITH([ipv6],
- ACX_HELP_STRING([--with-ipv6],
- [enable IPv6 support (default=no)]),
- ,
- with_ipv6=no)
+AC_CHECK_HEADERS(unistd.h)
-dnl Check for AF_INET6 support
+dnl Check for AF_INET6 support - unistd.h required for Darwin
AC_CACHE_CHECK([for IPv6 support], with_ipv6, [
- AC_TRY_COMPILE([#include <netinet/in.h>
+ AC_TRY_COMPILE([#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #include <netinet/in.h>
#include <sys/socket.h>],
[struct sockaddr_in6 sin6;
void *p;
[enable getaddrinfo emulation (default=no)]),
,
enable_emulate_getaddrinfo=no)
+
AC_ARG_WITH(lwres,
ACX_HELP_STRING([--with-lwres=DIR],
[use lwres library for getaddrinfo (default=no)]),
[Does system provide RFC 2553/Posix getaddrinfo?])
else
if test x$enable_emulate_getaddrinfo != xyes ; then
- AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo])
+dnl AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo])
+ enable_emulate_getaddrinfo=yes
+ AC_MSG_WARN([enabling getaddrinfo emulation])
fi
- LIBOBJS="$LIBOBJS getaddrinfo.o"
+ EXTRA_NETOBJS="$EXTRA_NETOBJS getaddrinfo.o"
fi
if test x"$enable_emulate_getaddrinfo" != xno ; then
AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, ,
[AC_MSG_ERROR([cannot find gethostbyname])])
fi
- LIBOBJS="$LIBOBJS gethostbyname.o"
+ EXTRA_NETOBJS="$EXTRA_NETOBJS gethostbyname.o"
fi
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 <sys/vfs.h>],
- [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 <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+[AC_TRY_COMPILE(
+ [#include <sys/types.h>
+#include <inttypes.h>],
+ [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 <inttypes.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
+fi
-dnl FreeBSD
-AC_CHECK_HEADERS(sys/param.h sys/mount.h,
- [AC_TRY_COMPILE([#include <sys/param.h>
-#include <sys/mount.h>],
- [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 <sys/vfs.h> 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 <sys/types.h>
+#include <sys/vfs.h>],
+[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
dnl #### Process table test
AC_PATH_PROG(PATH_TO_PS,ps)
-ac_cv_use_ps_vars=no
AC_MSG_CHECKING(for ps syntax)
dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
if 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_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 %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"
EXTRAS="$EXTRAS check_nagios"
AC_MSG_RESULT([$ac_cv_ps_command])
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_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 %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"
EXTRAS="$EXTRAS check_nagios"
AC_MSG_RESULT([$ac_cv_ps_command])
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_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 %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"
EXTRAS="$EXTRAS check_nagios"
AC_MSG_RESULT([$ac_cv_ps_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])
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])
@@ -697,15 +676,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_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 %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"
EXTRAS="$EXTRAS check_nagios"
AC_MSG_RESULT([$ac_cv_ps_command])
@@ -713,75 +686,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_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 %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"
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_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 %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"
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_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 %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"
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_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 %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"
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_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 %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"
EXTRAS="$EXTRAS check_nagios"
AC_MSG_RESULT([$ac_cv_ps_command])
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_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 %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"
EXTRAS="$EXTRAS check_nagios"
AC_MSG_RESULT([$ac_cv_ps_command])
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:
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])
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)
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)
[NEED_VA_LIST=-DNEED_VA_LIST AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)])
AC_SUBST(EXTRAS)
+AC_SUBST(EXTRA_NETOBJS)
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,echo timestamp > plugins/stamp-h1;echo timestamp > plugins/stamp-h2;echo timestamp > plugins/stamp-h3;echo timestamp > plugins/stamp-h4;echo timestamp > plugins/stamp-h5;echo timestamp > plugins/stamp-h6;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])