![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.in b/configure.in
index 81b019b72e09677630267d7ab5491ebe659c279f..30e42611664f5d776a7a237fac28e24943cf5552 100644 (file)
--- a/configure.in
+++ b/configure.in
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
-AC_SUBST(VER)
-AC_SUBST(REL)
-PACKAGE_VERSION="${VER}"
-AC_SUBST(PACKAGE_VERSION)
-PACKAGE_RELEASE="${REL}"
-AC_SUBST(PACKAGE_RELEASE)
-AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
-AM_CONFIG_HEADER(plugins/config.h)
+AC_PREREQ(2.58)
+AC_INIT(nagios-plugins,1.4-beta1)
+AC_CONFIG_SRCDIR(Helper.pm)
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
+RELEASE=1
+AC_SUBST(RELEASE)
+
AC_PREFIX_DEFAULT(/usr/local/nagios)
dnl Figure out how to invoke "install" and what install options to use.
-
AC_PROG_INSTALL
AC_SUBST(INSTALL)
+dnl Must come very early on due to coreutils requirement
+dnl Takes care of AC_GNU_SOURCE, AC_AIX and AC_MINIX
+gl_USE_SYSTEM_EXTENSIONS
+
AC_PROG_CC
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
AC_PROG_RANLIB
-AC_AIX
-AC_MINIX
AC_PROG_MAKE_SET
AC_PROG_AWK
-saved_srcdir=$srcdir
-srcdir=$srcdir/lib
-test -f $srcdir/getloadavg.c \
- || AC_MSG_ERROR([getloadavg.c is not in $srcdir])
-AC_FUNC_GETLOADAVG
-srcdir=$saved_srcdir
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_FUNC_ERROR_AT_LINE
+
+AC_CONFIG_LIBOBJ_DIR(lib)
+AC_FUNC_GETLOADAVG([lib])
ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
dnl AM_WITH_REGEX
-AC_PROG_RANLIB
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\nPlease include version information with all correspondence. (when possible, use output from the --version option of the plugin itself)."
+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,\nuse output from the --version option of the plugin itself).\n"
AC_SUBST(SUPPORT)
dnl CGIURL has changed for Nagios with 1.0 beta
LDAPINCLUDE="-I/usr/include/ldap"
AC_SUBST(LDAPLIBS)
AC_SUBST(LDAPINCLUDE)
+ AC_CHECK_FUNCS(ldap_set_option)
EXTRAS="$EXTRAS check_ldap"
+ AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
else
AC_MSG_WARN([Skipping LDAP plugin])
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
AC_MSG_WARN([Skipping mysql plugin])
AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
fi
-CPPFLAGS="$_SAVEDCPPFLAGS"
+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
LIBS="$_SAVEDLIBS"
-dnl Check for OpenSSL location
-AC_PATH_PROG(OPENSSL,openssl)
-if test "$OPENSSL" = "/usr/bin/openssl"; then
- OPENSSL=/usr
-elif test "$OPENSSL" = "/usr/sbin/openssl"; then
- OPENSSL=/usr
-elif test "$OPENSSL" = "/opt/bin/openssl"; then
- OPENSSL=/opt
-elif test "$OPENSSL" = "/opt/openssl/bin/openssl"; then
- OPENSSL=/opt/openssl
-elif test "$OPENSSL" = "/usr/slocal/bin/openssl"; then
- OPENSSL=/usr/slocal
-elif test "$OPENSSL" = "/usr/local/bin/openssl"; then
- OPENSSL=/usr/local
-elif test "$OPENSSL" = "/usr/local/ssl/bin/openssl"; then
- OPENSSL=/usr/local/ssl
-fi
-AC_ARG_WITH(openssl,
- ACX_HELP_STRING([--with-openssl=DIR],
- [sets path to openssl installation]),
- OPENSSL=$withval,)
-
AC_CHECK_HEADERS(unistd.h)
dnl Check for AF_INET6 support - unistd.h required for Darwin
fi
+dnl Checks for Kerberos. Must come before openssl checks for Redhat EL 3
AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no)
if test "$FOUNDINCLUDE" = "no"; then
_SAVEDCPPFLAGS="$CPPFLAGS"
CPPFLAGS="$_SAVEDCPPFLAGS"
fi
-dnl Check for OpenSSL header files
-unset FOUNDINCLUDE
-_SAVEDCPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
-AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h,
+dnl Check for OpenSSL location
+AC_PATH_PROG(OPENSSL,openssl)
+if test "$OPENSSL" = "/usr/bin/openssl"; then
+ OPENSSL=/usr
+elif test "$OPENSSL" = "/usr/sbin/openssl"; then
+ OPENSSL=/usr
+elif test "$OPENSSL" = "/opt/bin/openssl"; then
+ OPENSSL=/opt
+elif test "$OPENSSL" = "/opt/openssl/bin/openssl"; then
+ OPENSSL=/opt/openssl
+elif test "$OPENSSL" = "/usr/slocal/bin/openssl"; then
+ OPENSSL=/usr/slocal
+elif test "$OPENSSL" = "/usr/local/bin/openssl"; then
+ OPENSSL=/usr/local
+elif test "$OPENSSL" = "/usr/local/ssl/bin/openssl"; then
+ OPENSSL=/usr/local/ssl
+fi
+AC_ARG_WITH(openssl,
+AC_HELP_STRING([--with-openssl=DIR], [sets path to openssl installation])
+AC_HELP_STRING([--without-openssl], [disable openssl]),
+OPENSSL=$withval)
+
+if test X"$OPENSSL" = "Xno"; then
+ AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins])
+ FOUNDSSL="dontbother"
+else
+ dnl Check for OpenSSL header files
+ unset FOUNDINCLUDE
+ _SAVEDCPPFLAGS="$CPPFLAGS"
+ if test "$OPENSSL" != "/usr"; then
+ CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
+ fi
+ AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h,
SSLINCLUDE="-I$OPENSSL/include"
FOUNDINCLUDE=yes,
FOUNDINCLUDE=no)
-if test "$FOUNDINCLUDE" = "no"; then
- AC_CHECK_HEADERS(ssl.h x509.h rsa.h pem.h crypto.h err.h,
+ if test "$FOUNDINCLUDE" = "no"; then
+ AC_CHECK_HEADERS(ssl.h x509.h rsa.h pem.h crypto.h err.h,
SSLINCLUDE="-I$OPENSSL/include"
FOUNDINCLUDE=yes,
FOUNDINCLUDE=no)
-fi
-AC_SUBST(SSLINCLUDE)
-if test "$FOUNDINCLUDE" = "no"; then
- CPPFLAGS="$_SAVEDCPPFLAGS"
-fi
-
-dnl Check for crypto lib
-_SAVEDLIBS="$LIBS"
-AC_CHECK_LIB(crypto,CRYPTO_lock,,,-L$OPENSSL/lib)
-if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
- dnl Check for SSL lib
- AC_CHECK_LIB(ssl,main,LDFLAGS="$LDFLAGS -L$OPENSSL/lib" SSLLIBS="-lssl -lcrypto",AC_CHECK_LIB(ssl,main,LDFLAGS="$LDFLAGS -L$OPENSSL/lib" SSLLIBS="-lssl -lcrypto"),-L$OPENSSL/lib -lcrypto)
-fi
-LIBS="$_SAVEDLIBS"
+ fi
+ AC_SUBST(SSLINCLUDE)
+ if test "$FOUNDINCLUDE" = "no"; then
+ CPPFLAGS="$_SAVEDCPPFLAGS"
+ fi
-dnl test headers and libs to decide whether check_http should use SSL
-if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
- if test "$ac_cv_lib_ssl_main" = "yes"; then
- if test "$FOUNDINCLUDE" = "yes"; then
- AC_SUBST(SSLLIBS)
- AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
+ dnl Check for crypto lib
+ _SAVEDLIBS="$LIBS"
+ AC_CHECK_LIB(crypto,CRYPTO_lock,,,-L$OPENSSL/lib)
+ if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
+ dnl Check for SSL lib
+ AC_CHECK_LIB(ssl,main,LDFLAGS="$LDFLAGS -L$OPENSSL/lib" SSLLIBS="-lssl -lcrypto",AC_CHECK_LIB(ssl,main,LDFLAGS="$LDFLAGS -L$OPENSSL/lib" SSLLIBS="-lssl -lcrypto"),-L$OPENSSL/lib -lcrypto)
+ fi
+ LIBS="$_SAVEDLIBS"
+
+ FOUNDSSL="no"
+ dnl test headers and libs to decide whether check_http should use SSL
+ if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
+ if test "$ac_cv_lib_ssl_main" = "yes"; then
+ if test "$FOUNDINCLUDE" = "yes"; then
+ FOUNDSSL="yes"
+ fi
fi
fi
fi
+
+if test "$FOUNDSSL" = "yes"; then
+ check_tcp_ssl="check_simap check_spop check_jabber check_nntps"
+ AC_SUBST(check_tcp_ssl)
+ AC_SUBST(SSLLIBS)
+ AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
+ with_openssl="yes"
+elif test "$FOUNDSSL" = "no"; then
+ AC_MSG_WARN([OpenSSL libs could not be found])
+ with_openssl="no"
+else
+ with_openssl="no"
+fi
CPPFLAGS="$_SAVEDCPPFLAGS"
dnl
AC_HEADER_TIME
AC_HEADER_SYS_WAIT
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
-
-# 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
+AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h stdlib.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
AC_TYPE_SIGNAL
-AC_CHECK_SIZEOF(int,cross)
-AC_CHECK_SIZEOF(long,cross)
-AC_CHECK_SIZEOF(short,cross)
-
-AC_CACHE_CHECK([for long long],ac_cv_have_longlong,[
-AC_TRY_RUN([#include <stdio.h>
-main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }],
-ac_cv_have_longlong=yes,ac_cv_have_longlong=no,ac_cv_have_longlong=cross)])
-if test x"$ac_cv_have_longlong" = x"yes"; then
- AC_DEFINE(HAVE_LONGLONG,1,[Define if system has long long type])
-fi
-
-#
-# Check if the compiler supports the LL prefix on long long integers.
-# AIX needs this.
-
-AC_CACHE_CHECK([for LL suffix on long long integers],ac_cv_compiler_supports_ll, [
- AC_TRY_COMPILE([#include <stdio.h>],[long long i = 0x8000000000LL],
- ac_cv_compiler_supports_ll=yes,ac_cv_compiler_supports_ll=no)])
-if test x"$ac_cv_compiler_supports_ll" = x"yes"; then
- AC_DEFINE(COMPILER_SUPPORTS_LL,1,[Define if compiler support long long])
-fi
-
-AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE_VA_COPY,[
+AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
AC_TRY_LINK([#include <stdarg.h>
-va_list ap1,ap2;], [__va_copy(ap1,ap2);],
-ac_cv_HAVE_VA_COPY=yes,ac_cv_HAVE_VA_COPY=no)])
+va_list ap1,ap2;], [va_copy(ap1,ap2);],
+ac_cv_HAVE_VA_COPY=yes,
+ac_cv_HAVE_VA_COPY=no)])
if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then
- AC_DEFINE(HAVE_VA_COPY,1,[Define if system has va_copy])
+ AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
+else
+ AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE___VA_COPY,[
+ AC_TRY_LINK([#include <stdarg.h>
+ va_list ap1,ap2;], [__va_copy(ap1,ap2);],
+ ac_cv_HAVE___VA_COPY=yes,
+ ac_cv_HAVE___VA_COPY=no)])
+ if test x"$ac_cv_HAVE___VA_COPY" = x"yes"; then
+ AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
+ fi
fi
AC_CHECK_FUNCS(vsnprintf snprintf asprintf vasprintf)
AC_MSG_CHECKING(for ps syntax)
dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
+dnl Should also work for FreeBSD 5.2.1 and 5.3
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
+ egrep -i ["^ *STAT +[UCOMAND]+ +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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
-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
+elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \
+ egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
then
- 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_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
+ ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu etime comm args'"
+ ac_cv_ps_format="%s %d %d %d %d %f %s %s %n"
+ ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
dnl FreeBSD
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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
dnl BSD-like mode in RH 6.1
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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
dnl SunOS 4.1.3:
dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND
-elif ps -laxnwww 2>/dev/null | \
+dnl Need the head -1 otherwise test will work because arguments are found
+elif ps -laxnwww 2>/dev/null | head -1 | \
egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
then
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 %d %d %*s %s %*s %*s %n%s"
- EXTRAS="$EXTRAS check_nagios"
+ ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
dnl Debian Linux / procps v1.2.9:
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 %d %d %*s %s %*s %*s %n%s"
- EXTRAS="$EXTRAS check_nagios"
+ ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
-dnl AIX 4.3.3 - needs verification. This works for Tru64 - needs %*[ +] in PS_FORMAT
+dnl Tru64 - needs %*[ +] in PS_FORMAT
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_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_cv_ps_format=["%s%*[ +] %d %d %d %d %f %s %n"]
+ ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \
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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
+dnl AIX 4.3.3 and 5.1 do not have an rss field
+elif ps -eo 'stat uid ppid vsz pcpu comm args' 2>/dev/null | \
+ egrep -i ["^ *S[TAUES]* +UID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
+then
+ ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
+ ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid ppid vsz pcpu comm args'"
+ ac_cv_ps_format="%s %d %d %d %f %s %n"
+ ac_cv_ps_cols=7
+ AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
+
+dnl Solaris 2.6
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_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"
+ # There must be no space between the %s and %n due to a wierd problem in sscanf where
+ # it will return %n as longer than the line length
+ ac_cv_ps_format="%s %d %d %d %d %f %s%n"
+ ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \
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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \
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_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
dnl wonder who takes state instead of stat
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_cv_ps_cols=7
AC_MSG_RESULT([$ac_cv_ps_command])
dnl IRIX 53
egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -el"
+ ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
+ ac_cv_ps_cols=7
AC_MSG_RESULT([$ac_cv_ps_command])
dnl IRIX 63
egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -el"
+ ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
+ ac_cv_ps_cols=5
AC_MSG_RESULT([$ac_cv_ps_command])
dnl AIX 4.1:
egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
then
ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -el"
+ ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
+ ac_cv_ps_cols=5
AC_MSG_RESULT([$ac_cv_ps_command])
dnl AIX?
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 %d %d %*s %s %*s %*s %n%s"
+ ac_cv_ps_cols=7
AC_MSG_RESULT([$ac_cv_ps_command])
dnl MacOSX / Darwin
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_cv_ps_cols=7
AC_MSG_RESULT([$ac_cv_ps_command])
dnl UnixWare
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
+ ac_cv_ps_cols=7
AC_MSG_RESULT([$ac_cv_ps_command])
else
- AC_MSG_WARN([unable to find usable ps syntax])
+ AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
fi
-AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
- [Variable list for sscanf of 'ps' output])
-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_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])
+if test -n "$ac_cv_ps_varlist" ; then
+ AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
+ [Variable list for sscanf of 'ps' output])
+ 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(PS_COLS,$ac_cv_ps_cols,
+ [Number of columns in ps command])
+ EXTRAS="$EXTRAS check_procs check_nagios"
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)
AC_MSG_CHECKING(for ICMP ping syntax)
ac_cv_ping_packets_first=no
+ac_cv_ping_has_timeout=no
if test -n "$with_ping_command"
then
AC_MSG_RESULT([(command-line) $with_ping_command])
ac_cv_ping_packets_first=yes
AC_MSG_RESULT([$with_ping_command])
+elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
+ egrep -i "^round-trip|^rtt" >/dev/null
+then
+ with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+ ac_cv_ping_packets_first=yes
+ ac_cv_ping_has_timeout=yes
+ AC_MSG_RESULT([$with_ping_command])
+
elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
[Define if packet count must precede host])
fi
+if test "x$ac_cv_ping_has_timeout" != "xno"
+then
+ AC_DEFINE(PING_HAS_TIMEOUT,1,
+ [Define if ping has its own timeout option that should be set])
+fi
+
AC_ARG_WITH(ping6_command,
ACX_HELP_STRING([--with-ping6-command=SYNTAX],
[sets syntax for ICMPv6 ping]),
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.
-
-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)
-
-AC_MSG_CHECKING(for how to check memory)
-if [cat /proc/meminfo > /dev/null 2>&1]
+if (test -n "$PATH_TO_SWAP")
then
- AC_MSG_RESULT([found /proc/meminfo])
- 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"
-
-elif [$PATH_TO_SWAP -l 2>&1 >/dev/null]
+AC_MSG_CHECKING([for $PATH_TO_SWAP format])
+if [$PATH_TO_SWAP -l 2>&1 >/dev/null]
then
ac_cv_have_swap=yes
ac_cv_swap_command="$PATH_TO_SWAP -l"
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_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_conv=2048
AC_MSG_RESULT([using Unixware format swap])
-
+ else
+ dnl if we don't know what format swap's output is
+ dnl we might as well pretend we didn't see it
+ ac_cv_have_swap=""
+ ac_cv_swap_command=""
fi
- EXTRAS="$EXTRAS check_swap"
+fi
+dnl end if for PATH_TO_SWAP
+fi
-elif [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
+AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
+if (test -n "$PATH_TO_SWAPINFO")
+then
+AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
+if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
then
ac_cv_have_swap=yes
ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
ac_cv_swap_conv=1024
AC_MSG_RESULT([using FreeBSD format swapinfo])
fi
- EXTRAS="$EXTRAS check_swap"
elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
then
ac_cv_swap_conv=1024
AC_MSG_RESULT([using HP-UX format swapinfo])
fi
+dnl end if for PATH_TO_SWAPINFO
+fi
+
+AC_PATH_PROG(PATH_TO_LSPS,lsps)
+if (test -n "$PATH_TO_LSPS")
+then
+AC_MSG_CHECKING([for $PATH_TO_LSPS format])
+if [$PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null]
+then
+ ac_cv_have_swap=yes
+ ac_cv_swap_command="$PATH_TO_LSPS -a"
+ ac_cv_swap_format=["%*s %*s %*s %d%*s %d %*s"]
+ ac_cv_swap_conv=1
+ AC_MSG_RESULT([using AIX lsps])
+fi
+dnl end if for PATH_TO_SWAPINFO
+fi
+
+dnl
+dnl test for swapctl system call, both the 2-arg and 3-arg variants
+dnl fwict, the 2-arg is an SVR4 standard, whereas the 3-arg is shared
+dnl in the various BSD's
+dnl
+
+AC_CHECK_HEADERS([sys/swap.h], [], [], [
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
+AC_CHECK_HEADERS([sys/stat.h sys/param.h])
+AC_CHECK_DECLS([swapctl],,,[
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/swap.h>
+ ])
+AC_CHECK_TYPES([swaptbl_t, swapent_t],,,[
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/swap.h>
+ ])
+AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/swap.h>
+ ])
+
+if test "$ac_cv_have_decl_swapctl" = "yes";
+then
+ EXTRAS="$EXTRAS check_swap"
+ AC_MSG_CHECKING([for 2-arg (SVR4) swapctl])
+ if test "$ac_cv_type_swaptbl_t" = "yes" -a \
+ "$ac_cv_type_swapent_t" = "yes";
+ then
+ AC_MSG_RESULT([yes])
+ ac_cv_check_swap_swapctl_svr4="1";
+ AC_DEFINE([CHECK_SWAP_SWAPCTL_SVR4],1,
+ [Define if 2-argument SVR4 swapctl exists])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_CHECKING([for 3-arg (*BSD) swapctl])
+ if test "$ac_cv_member_struct_swapent_se_nblks" = "yes";
+ then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([CHECK_SWAP_SWAPCTL_BSD],1,
+ [Define if 3-argument BSD swapctl exists])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+ AC_MSG_CHECKING([for whether swapctl uses blocks or pages])
+ if test "$ac_cv_check_swap_swapctl_svr4" = "1";
+ then
+ dnl
+ dnl the SVR4 spec returns values in pages
+ dnl
+ AC_MSG_RESULT([page])
+ AC_CHECK_DECLS([sysconf])
+ AC_MSG_CHECKING([for system page size])
+ if test "$ac_cv_have_decl_sysconf" = "yes";
+ then
+ AC_MSG_RESULT([determined by sysconf(3)])
+ ac_cv_swap_conv="(1048576/sysconf(_SC_PAGESIZE))"
+ else
+ AC_MSG_WARN([don't know. guessing 4096k])
+ ac_cv_swap_conv=256
+ fi
+ else
+ dnl
+ dnl the BSD spec returns values in blocks
+ dnl
+ AC_MSG_RESULT([blocks (assuming 512b)])
+ ac_cv_swap_conv=2048
+ fi
+ AC_DEFINE_UNQUOTED(SWAP_CONVERSION,$ac_cv_swap_conv,
+ [Conversion factor to MB])
+fi
+dnl
+dnl end tests for the swapctl system calls
+dnl
+
if test "x$ac_cv_have_swap" != "x"
then
AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
+ EXTRAS="$EXTRAS check_swap"
fi
if test "x$ac_cv_swap_command" != "x"
then
[Conversion factor to MB])
fi
+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_MSG_CHECKING([for /proc/meminfo])
+if [cat /proc/meminfo > /dev/null 2>&1]
+then
+ AC_MSG_RESULT([found /proc/meminfo])
+ 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"
+else
+ AC_MSG_RESULT([no])
+fi
+
AC_PATH_PROG(PATH_TO_DIG,dig)
AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG",[Path to dig command, if present])
if test -n "$PATH_TO_DIG"; then
AC_SUBST(EXTRA_NETOBJS)
AC_SUBST(DEPLIBS)
-AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}",[package version])
-
-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)
+AM_GNU_GETTEXT([no-libtool], [need-ngettext])
+AM_GNU_GETTEXT_VERSION(0.11.5)
+
+dnl External libraries - see ACKNOWLEDGEMENTS
+np_COREUTILS
+np_CURL
+
+AC_OUTPUT(
+ Makefile
+ lib/Makefile
+ m4/Makefile
+ plugins/Makefile
+ plugins-scripts/Makefile
+ plugins-scripts/subst
+ plugins-scripts/utils.pm
+ plugins-scripts/utils.sh
+ command.cfg
+ test.pl
+ pkg/solaris/pkginfo
+ intl/Makefile
+ po/Makefile.in
+)
ACX_FEATURE([with],[cgiurl])
ACX_FEATURE([with],[nagios-user])
ACX_FEATURE([with],[nagios-group])
ACX_FEATURE([with],[trusted-path])
-ACX_FEATURE([with],[df-command])
ACX_FEATURE([with],[ping-command])
ACX_FEATURE([with],[ping6-command])
ACX_FEATURE([with],[lwres])
ACX_FEATURE([with],[ipv6])
+ACX_FEATURE([with],[openssl])
ACX_FEATURE([enable],[emulate-getaddrinfo])