From e667553b97c358f5d80608f62c291deffc0328d5 Mon Sep 17 00:00:00 2001 From: "M. Sean Finney" Date: Mon, 1 May 2006 21:52:42 +0000 Subject: - check_ntp: - now roughly feature-complete. - various bugfixes, esp. offset calculation. - enhanced the asynchronous offset polling to set requests that haven't recieved a response in >= 1 second to stale and retransmit them, which results in much better performance on unreliable networks. - we only spend timeout/2 seconds polling offsets, and if we don't get everything by that point we work with what we have and set status to warning/critical depending on how much data we have. - set the same defaults as the perl script. - commit changes to configure.in to support automatic building of check_apt (if apt-get is installed and regex libraries available) and check_ntp (unconditionally), now defaulting to check_ntp.c instead of the perl script. if this is an issue we can back out the commit of course. an eye should be kept on check_ntp building and running correctly in different environments, esp. 64-bit and big-endian platforms, and those with more "esoteric" API's (do any of the platforms not have poll()?). - similar changes to Makefile.am's. - common.h: add statement to include sys/poll.h - runcmd.c: exit STATE_UNKNOWN if execve() fails. git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1386 f882894a-f735-0410-b71e-b25c423dba1c --- configure.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c143905b..6556ecdb 100644 --- a/configure.in +++ b/configure.in @@ -529,8 +529,9 @@ dnl AC_HEADER_STDC 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 sys/un.h) +AC_CHECK_HEADERS(signal.h strings.h string.h syslog.h uio.h errno.h sys/types.h sys/time.h sys/socket.h sys/loadavg.h sys/un.h sys/poll.h) AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h stdlib.h) +AC_CHECK_HEADERS(regex.h,FOUNDREGEX=yes,FOUNDREGEX=no) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -601,7 +602,7 @@ AC_TRY_COMPILE([#include ], dnl Checks for library functions. AC_CHECK_FUNCS(memmove select socket strdup strstr strtod strtol strtoul floor) -AC_CHECK_FUNCS(basename) +AC_CHECK_FUNCS(basename poll) AC_MSG_CHECKING(return type of socket size) AC_TRY_COMPILE([#include @@ -1263,20 +1264,6 @@ AC_ARG_WITH(rpcinfo_command, [sets path to rpcinfo]), PATH_TO_RPCINFO=$withval) AC_DEFINE_UNQUOTED(PATH_TO_RPCINFO,"$PATH_TO_RPCINFO",[path to rpcinfo binary]) -AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate) -AC_ARG_WITH(ntpdate_command, - ACX_HELP_STRING([--with-ntpdate-command=PATH], - [sets path to ntpdate]), PATH_TO_NTPDATE=$withval) -AC_PATH_PROGS(PATH_TO_NTPDC,ntpdc xntpdc) -AC_PATH_PROGS(PATH_TO_NTPQ,ntpq) -if (test -n "$PATH_TO_NTPDATE" || test -n "$PATH_TO_NTPQ") -then - AC_DEFINE_UNQUOTED(PATH_TO_NTPQ,"$PATH_TO_NTPQ",[path to ntpq binary]) - AC_DEFINE_UNQUOTED(PATH_TO_NTPDATE,"$PATH_TO_NTPDATE",[path to ntpdate binary]) -else - AC_MSG_WARN([Install NTP programs (http://www.ntp.org) if you want to monitor time synchronization]) -fi - AC_PATH_PROG(PATH_TO_LMSTAT,lmstat) if test -x "$PATH_TO_LMSTAT" then @@ -1621,6 +1608,19 @@ if test -n "$PATH_TO_DIG"; then AC_DEFINE_UNQUOTED(PATH_TO_DIG,"$PATH_TO_DIG",[Path to dig command, if present]) fi +AC_PATH_PROG(PATH_TO_APTGET,apt-get) +AC_ARG_WITH(apt-get_command, + ACX_HELP_STRING([--with-apt-get-command=PATH], + [Path to apt-get command]), + with_apt_get_command=$withval, + with_apt_get_command=$PATH_TO_APTGET) +AC_DEFINE_UNQUOTED(PATH_TO_APTGET,"$PATH_TO_APTGET",[Path to apt-get command, if present]) +# check_apt needs regex support +if test -n "$PATH_TO_APTGET" && test "$FOUNDREGEX" = "yes"; then + EXTRAS="$EXTRAS check_apt" +fi + + if test -f plugins/check_nt.c ; then EXTRAS="$EXTRAS check_nt" elif test -f ../plugins/check_nt.c ; then @@ -1718,11 +1718,11 @@ dnl the ones below that are commented out need to be cleaned up dnl in the configure code above to use with_foo instead of ac_cv_foo dnl if we want them to show up here. it'd also make the code cleaner. dnl i'll get to that on another rainy day :) -sf +ACX_FEATURE([with],[apt-get-command]) dnl ACX_FEATURE([with],[dig-command]) dnl ACX_FEATURE([with],[fping-command]) dnl ACX_FEATURE([with],[mailq-command]) dnl ACX_FEATURE([with],[nslookup-command]) -dnl ACX_FEATURE([with],[ntpdate-command]) ACX_FEATURE([with],[ping6-command]) ACX_FEATURE([with],[ping-command]) dnl ACX_FEATURE([with],[qstat-command]) -- cgit v1.2.3-74-g34f1