X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.in;h=264a0676aad430c6db37dd670f904fa086ccceae;hb=f8766fe505898d1617e11703840ac0a42f25272e;hp=e02dc8955ed2c26908fecdb2b9f0085f8e6fcc1d;hpb=2db2f402a3bb0c948667c1401b733014fe90a718;p=nagiosplug.git diff --git a/configure.in b/configure.in index e02dc89..264a067 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_REVISION ($Revision$) -AC_PREREQ(2.58) -AC_INIT(nagios-plugins,1.4.2) +AC_PREREQ(2.59) +AC_INIT(nagios-plugins,1.4.8) AC_CONFIG_SRCDIR(NPTest.pm) -AM_INIT_AUTOMAKE +AC_CONFIG_FILES(gl/Makefile) +AC_CONFIG_AUX_DIR(build-aux) +AM_INIT_AUTOMAKE([1.8.3]) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -12,31 +14,42 @@ 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 Deprecated configure options + + +dnl Append user (-o), group (-g), mode (-m) to install command +dnl There is an assumption that this is possible with ./configure's chosen install command +extra_install_args="" +AC_ARG_WITH(nagios_user, + ACX_HELP_STRING([--with-nagios-user=USER], + [Installs executables with this user. Defaults to install user]), + extra_install_args="-o $withval") +AC_ARG_WITH(nagios_group, + ACX_HELP_STRING([--with-nagios-group=GROUP], + [Installs executables with this group. Defaults to install user]), + extra_install_args="$extra_install_args -g $withval") +AC_ARG_WITH(world_permissions, + ACX_HELP_STRING([--without-world-permissions], + [Installs executables without world permissions])) + +if test "x$with_world_permissions" = xno ; then + extra_install_args="$extra_install_args -m 0550" +fi -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 +INSTALL="$INSTALL $extra_install_args" +INSTALL_STRIP_PROGRAM="$INSTALL_STRIP_PROGRAM $extra_install_args" +AC_SUBST(INSTALL) AC_PROG_CC -AC_PROG_CPP +gl_EARLY AC_PROG_GCC_TRADITIONAL AC_PROG_LIBTOOL -AC_PROG_MAKE_SET -AC_PROG_AWK +AM_PROG_CC_C_O -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 PLUGIN_TEST=`echo $srcdir/plugins/t/*.t|sed -e 's,\.*/plugins/,,g'` AC_SUBST(PLUGIN_TEST)dnl @@ -59,21 +72,6 @@ AC_ARG_WITH(cgiurl, CGIURL="$with_cgiurl" AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) -AC_ARG_WITH(nagios_user, - ACX_HELP_STRING([--with-nagios-user=USER], - [set user name to run nagios]), - with_nagios_user=$withval, - with_nagios_user=nagios) -AC_ARG_WITH(nagios_group, - ACX_HELP_STRING([--with-nagios-group=GROUP], - [set group name to run nagios]), - with_nagios_group=$withval, - with_nagios_group=nagios) -AC_SUBST(with_nagios_user) -AC_SUBST(with_nagios_group) -INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group" -AC_SUBST(INSTALL_OPTS) - AC_ARG_WITH(trusted_path, ACX_HELP_STRING([--with-trusted-path=PATH], [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]), @@ -82,6 +80,7 @@ AC_ARG_WITH(trusted_path, AC_SUBST(with_trusted_path) EXTRAS= +EXTRAS_ROOT= dnl PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH LDFLAGS="$LDFLAGS -L." @@ -137,18 +136,6 @@ dnl the order should allow locally installed versions to override distros' ones OPENSSL_DIRS="/usr /usr/local /usr/slocal /usr/local/openssl /usr/local/ssl \ /opt /opt/openssl" -dnl -dnl Check for miscellaneous stuff -dnl - -case $host_vender-$host_os in -sun*) - AC_DEFINE(__EXTENSIONS__,1,[Sun's netdb.h needs this for getaddrinfo]) - ;; -osf*) - AC_DEFINE(_OSF_SOURCE,1,[OSF needs this for getaddrinfo]) - ;; -esac dnl dnl Checks for libraries. @@ -168,7 +155,7 @@ AC_SUBST(MATHLIBS) dnl Check for libtap, to run perl-like tests AC_CHECK_LIB(tap, plan_tests, - EXTRA_TEST=test_utils + EXTRA_TEST="test_utils test_disk" AC_SUBST(EXTRA_TEST) ) @@ -254,74 +241,19 @@ fi LIBS="$_SAVEDLIBS" dnl Check for mysql libraries -_SAVEDLIBS="$LIBS" -_SAVEDCPPFLAGS="$CPPFLAGS" -FOUNDMYSQL="no" -AC_ARG_WITH(mysql, - ACX_HELP_STRING([--with-mysql=DIR], - [sets path to mysql installation (assumes lib/lib64 and include subdirs)]), - MYSQL=$withval,) -# Find the mysql client libs -if test -n "$MYSQL"; then - MYSQLLIBDIR=$MYSQL/lib - MYSQLLIB64DIR=$MYSQL/lib64 -elif test -f /usr/lib/libmysqlclient.so -o -f /usr/lib/libmysqlclient.a ; then - MYSQL="/usr" - MYSQLLIBDIR=$MYSQL/lib - MYSQLLIB64DIR=$MYSQL/lib64 -elif test -f /usr/lib/mysql/libmysqlclient.so -o -f /usr/lib/mysql/libmysqlclient.a ; then - MYSQL="/usr" - MYSQLLIBDIR=$MYSQL/lib/mysql - MYSQLLIB64DIR=$MYSQL/lib64/mysql -elif test -f /usr/local/lib/libmysqlclient.so -o -f /usr/local/lib/libmysqlclient.a ; then - MYSQL="/usr/local" - MYSQLLIBDIR=$MYSQL/lib - MYSQLLIB64DIR=$MYSQL/lib64 -elif test -f /usr/local/lib/mysql/libmysqlclient.so -o -f /usr/local/lib/mysql/libmysqlclient.a ; then - MYSQL="/usr/local" - MYSQLLIBDIR=$MYSQL/lib/mysql - MYSQLLIB64DIR=$MYSQL/lib64/mysql -elif test -f /usr/local/mysql/lib/libmysqlclient.so -o -f /usr/local/mysql/lib/libmysqlclient.a ; then - MYSQL="/usr/local/mysql" - MYSQLLIBDIR=$MYSQL/lib - MYSQLLIB64DIR=$MYSQL/lib64 -fi - -# Check libs okay -if test -n "$MYSQL" ; then - CPPFLAGS="-L$MYSQLLIBDIR -L$MYSQLLIB64DIR" - AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) - AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") -fi - -# Check headers okay -if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then - CPPFLAGS="-I$MYSQL/include" - AC_CHECK_HEADERS(mysql.h errmsg.h, FOUNDMYSQL="yes" MYSQLINCLUDE="-I$MYSQL/include") - if test x"$FOUNDMYSQL" != x"yes" ; then - AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, FOUNDMYSQL="yes" MYSQLINCLUDE="-I$MYSQL/include/mysql") - fi -fi - -# Setup mysql plugins -if test $FOUNDMYSQL = "yes" ; then +np_mysqlclient +if test $with_mysql = "no" ; then + AC_MSG_WARN([Skipping mysql plugin]) + AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) +else EXTRAS="$EXTRAS check_mysql check_mysql_query" - if test -d $MYSQLLIB64DIR ; then - MYSQLLIBS="-L$MYSQLLIB64DIR -rpath $MYSQLLIB64DIR $MYSQLLIBS" - fi - if test -d $MYSQLLIBDIR ; then - MYSQLLIBS="-L$MYSQLLIBDIR -rpath $MYSQLLIBDIR $MYSQLLIBS" - fi + MYSQLINCLUDE="$np_mysql_include" + MYSQLLIBS="$np_mysql_libs" + MYSQLCFLAGS="$np_mysql_cflags" AC_SUBST(MYSQLINCLUDE) AC_SUBST(MYSQLLIBS) -else - AC_MSG_WARN([Skipping mysql plugin]) - AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) + AC_SUBST(MYSQLCFLAGS) fi -CPPFLAGS="$_SAVEDCPPFLAGS" -LIBS="$_SAVEDLIBS" - -AC_CHECK_HEADERS(unistd.h) dnl Check for AF_INET6 support - unistd.h required for Darwin AC_CACHE_CHECK([for IPv6 support], with_ipv6, [ @@ -344,108 +276,6 @@ if test x"$with_ipv6" != xno ; then AC_DEFINE(USE_IPV6,1,[Enable IPv6 support]) fi -dnl ######################################################################### -dnl Check if Posix getaddrinfo() is available. It is also possible to use -dnl the version from the lwres library distributed with BIND. -dnl ######################################################################### -AC_ARG_ENABLE([emulate-getaddrinfo], - ACX_HELP_STRING([--enable-emulate-getaddrinfo], - [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)]), - , - with_lwres=no) - -dnl ## enable force to test getaddrinfo.c -if test x$enable_emulate_getaddrinfo = xforce ; then - enable_emulate_getaddrinfo=yes - have_getaddrinfo=no -else - -have_getaddrinfo=no -if test x$with_lwres != xno ; then - if test "$with_lwres" != yes ; then - CPPFLAGS="-I${with_lwres}/include $CPPFLAGS" - LDFLAGS="-L${with_lwres}/lib $LDFLAGS" - fi - AC_CHECK_HEADERS(lwres/netdb.h, , - [AC_MSG_ERROR([cannot find ])]) - AC_CHECK_LIB(lwres, lwres_getaddrinfo, , - [AC_MSG_ERROR([cannot find the lwres library])], - -lnsl -lpthread) - have_getaddrinfo=yes -fi - -if test x$have_getaddrinfo != xyes ; then - AC_SEARCH_LIBS(getaddrinfo, socket resolv bind nsl c_r cr, have_getaddrinfo=yes) -fi - -dnl # Special nonsense for systems that actually have getaddrinfo but -dnl # redefine the name to something else, e.g. OSF -if test x$have_getaddrinfo != xyes ; then - AC_MSG_CHECKING(if getaddrinfo is redefined in netdb.h) - AC_TRY_LINK([ -# include - ], [ - struct addrinfo hints, *res; - int err; - - err = getaddrinfo ("host", "service", &hints, &res); - ], [ - have_getaddrinfo=yes - AC_MSG_RESULT(yes) - ], [AC_MSG_RESULT(no)]) -fi - -fi - -if test x$have_getaddrinfo != xno ; then - if test x$enable_emulate_getaddrinfo != xno ; then - AC_MSG_ERROR([getaddrinfo found but emulate-getaddrinfo was enabled]) - fi - AC_DEFINE(HAVE_GETADDRINFO, 1, - [Does system provide RFC 2553/Posix getaddrinfo?]) -else - if test x$enable_emulate_getaddrinfo != xyes ; then -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 - EXTRA_NETOBJS="$EXTRA_NETOBJS getaddrinfo.o" -fi - -if test x"$enable_emulate_getaddrinfo" != xno ; then - have_resolver=no - - dnl Try for getipnodebyname - AC_SEARCH_LIBS(getipnodebyname, resolv bind nsl c_r cr, have_resolver=yes) - if test x"$have_resolver" != xno ; then - AC_DEFINE(HAVE_GETIPNODEBYNAME, 1, - [Set when getipnodebyname is available]) - fi - - dnl Try for gethostbyname_r - if test x"$have_resolver" = xno ; then - AC_SEARCH_LIBS(gethostbyname_r, resolv bind nsl c_r cr, - [have_resolver=yes - ACX_WHICH_GETHOSTBYNAME_R]) - fi - - dnl Try for gethostbyname - if test x"$have_resolver" = xno ; then - if test x"$enable_pthreads" != xno ; then - AC_MSG_WARN([using threads but cannot find gethostbyname_r or getipnodebyname]) - fi - AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, , - [AC_MSG_ERROR([cannot find gethostbyname])]) - fi - EXTRA_NETOBJS="$EXTRA_NETOBJS gethostbyname.o" - -fi dnl Checks for Kerberos. Must come before openssl checks for Redhat EL 3 AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no) @@ -481,7 +311,7 @@ if ! test x"$with_openssl" = x"no"; then unset FOUNDINCLUDE if test x"$with_openssl" != x"/usr" ; then CPPFLAGS="$CPPFLAGS -I$with_openssl/include" - LDFLAGS="$LDFLAGS -R$with_openssl/lib" + LDFLAGS="$LDFLAGS -L$with_openssl/lib" fi dnl check for openssl in $dir/include/openssl @@ -563,11 +393,10 @@ dnl dnl Checks for header files. 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(features.h stdarg.h sys/unistd.h ctype.h stdlib.h) +AC_CHECK_HEADERS(signal.h syslog.h uio.h errno.h sys/time.h sys/socket.h sys/un.h sys/poll.h) +AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -594,37 +423,6 @@ else fi fi -AC_CHECK_FUNCS(vsnprintf snprintf asprintf vasprintf) -AC_CACHE_CHECK([for C99 vsnprintf],ac_cv_HAVE_C99_VSNPRINTF,[ -AC_TRY_RUN([ -#include -#include -void foo(const char *format, ...) { - va_list ap; - int len; - char buf[5]; - - va_start(ap, format); - len = vsnprintf(buf, 0, format, ap); - va_end(ap); - if (len != 5) exit(1); - - va_start(ap, format); - len = vsnprintf(0, 0, format, ap); - va_end(ap); - if (len != 5) exit(1); - - if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1); - - exit(0); -} -main() { foo("hello"); } -], -ac_cv_HAVE_C99_VSNPRINTF=yes,ac_cv_HAVE_C99_VSNPRINTF=no,ac_cv_HAVE_C99_VSNPRINTF=cross)]) -if test x"$ac_cv_HAVE_C99_VSNPRINTF" = x"yes"; then - AC_DEFINE(HAVE_C99_VSNPRINTF,1,[Define if system has C99 compatible vsnprintf]) -fi - AC_TRY_COMPILE([#include ], [struct timeval *tv; struct timezone *tz;], @@ -637,7 +435,8 @@ AC_TRY_COMPILE([#include ], AC_DEFINE(NEED_GETTIMEOFDAY,1,[Define if gettimeofday is needed]))) dnl Checks for library functions. -AC_CHECK_FUNCS(memmove select socket strdup strstr strtod strtol strtoul floor) +AC_CHECK_FUNCS(memmove select socket strdup strstr strtol strtoul floor) +AC_CHECK_FUNCS(poll) AC_MSG_CHECKING(return type of socket size) AC_TRY_COMPILE([#include @@ -652,24 +451,6 @@ AC_TRY_COMPILE([#include AC_DEFINE_UNQUOTED(SOCKET_SIZE_TYPE, $ac_cv_socket_size_type , [Define type of socket size]) -AC_ARG_WITH(proc-loadavg, - ACX_HELP_STRING([--with-proc-loadavg=PATH], - [path to /proc/loadavg or equivalent]), - ac_cv_proc_loadavg=$withval) -AC_MSG_CHECKING([for /proc/loadavg]) -if test -n "$ac_cv_proc_loadavg"; then - AC_MSG_RESULT([(command line) $ac_cv_proc_loadavg]) -elif test -f "/proc/loadavg"; then - AC_MSG_RESULT([found /proc/loadavg]) - ac_cv_proc_loadavg="/proc/loadavg" -else - AC_MSG_RESULT([no]) -fi - -if test -n "$ac_cv_proc_loadavg"; then - AC_DEFINE(HAVE_PROC_LOADAVG,1,[Define if /proc/loadavg or similar exists]) - AC_DEFINE_UNQUOTED(PROC_LOADAVG,"/proc/loadavg",[Location of /proc/loadavg]) -fi dnl #### Process table test @@ -693,8 +474,6 @@ AC_ARG_WITH(ps_varlist, [Variable list for sscanf of 'ps' output]), PS_VARLIST=$withval) -AM_CONDITIONAL(WANT_PST3, false) - if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then ac_cv_ps_command="$PS_COMMAND" ac_cv_ps_format="$PS_FORMAT" @@ -702,30 +481,16 @@ if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test - ac_cv_ps_cols="$PS_COLS" AC_MSG_RESULT([(command-line) $ac_cv_ps_command]) -dnl Now using the pst3/kmem hack for solaris systems to avoid truncation -elif test "$ac_cv_uname_s" = "SunOS"; then - # - # this is a very, very ugly hack, to hardcode the location for plugins - # - if test "$libexecdir" = '${exec_prefix}/libexec'; then - if test "$exec_prefix" = "NONE"; then - if test "$prefix" = "NONE"; then - pst3="$ac_default_prefix/libexec/pst3" - else - pst3="$prefix/libexec/pst3" - fi - else - pst3="$exec_prefix/libexec/pst3" - fi - else - pst3="$libexecdir/pst3" - fi - ac_cv_ps_command="$pst3" - ac_cv_ps_format="%s %d %d %d %d %f %s %n" - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" +dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation +dnl Limitation that command name is not available +elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \ + egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null +then + ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]" + ac_cv_ps_command="/usr/ucb/ps -alxwwn" + ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT]%*s %*s %n"] ac_cv_ps_cols=8 - AC_MSG_RESULT([using nagios-plugins internal ps for solaris]) - AM_CONDITIONAL(WANT_PST3, true) + AC_MSG_RESULT([$ac_cv_ps_command]) dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. dnl so test for this first... @@ -979,7 +744,7 @@ if test -n "$ac_cv_ps_varlist" ; then AC_DEFINE_UNQUOTED(PS_COLS,$ac_cv_ps_cols, [Number of columns in ps command]) EXTRAS="$EXTRAS check_procs check_nagios" - if echo "$ac_cv_ps_varlist" | grep -q "procetime"; then + if echo "$ac_cv_ps_varlist" | grep "procetime" >/dev/null; then AC_DEFINE(PS_USES_PROCETIME,"yes", [Whether the ps utility uses the "procetime" field]) fi @@ -1258,17 +1023,17 @@ fi fi -AC_MSG_CHECKING(for nslookup syntax) AC_ARG_WITH(nslookup_command, ACX_HELP_STRING([--with-nslookup-command=PATH], [sets path to nslookup executable]), ac_cv_nslookup_command=$withval) if test -n "$ac_cv_nslookup_command"; then - AC_MSG_RESULT([(command line) $ac_cv_nslookup_command]) + AC_MSG_NOTICE([Using specific nslookup at $ac_cv_nslookup_command]) else AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup) if test -n "$PATH_TO_NSLOOKUP" then + AC_MSG_CHECKING(for nslookup syntax) if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null then ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" @@ -1289,11 +1054,13 @@ if test -n "$ac_cv_nslookup_command"; then AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup]) fi -AC_PATH_PROG(PATH_TO_HOST,host) -if test -n "$ac_cv_path_PATH_TO_HOST" -then - EXTRAS="$EXTRAS check_dns" -fi +AC_MSG_CHECKING([for number of cpus]) +AC_TRY_COMPILE([#include ], + [sysconf(_SC_NPROCESSORS_CONF) > 0;], + AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus]) + AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]), + AC_MSG_RESULT([cannot calculate]) + ) AC_PATH_PROG(PATH_TO_UPTIME,uptime) AC_ARG_WITH(uptime_command, @@ -1307,20 +1074,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 @@ -1507,7 +1260,7 @@ then elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null] then ac_cv_have_swap=yes - ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM", + ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" ac_cv_swap_format=["%*s %f %*d %f"] ac_cv_swap_conv=1024 AC_MSG_RESULT([using HP-UX format swapinfo]) @@ -1665,25 +1418,24 @@ 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]) +if test -n "$PATH_TO_APTGET" ; 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 EXTRAS="$EXTRAS check_nt" fi -AC_MSG_CHECKING(for va_list) -AC_TRY_COMPILE([#ifdef __STDC__ - #include - #include - #include - #else - #include - #include - #include - #endif], - [va_list args;], - [AC_MSG_RESULT(yes)], - [NEED_VA_LIST=-DNEED_VA_LIST AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)]) case $host in *bsd*) @@ -1701,11 +1453,12 @@ case $host in esac AC_SUBST(EXTRAS) +AC_SUBST(EXTRAS_ROOT) AC_SUBST(EXTRA_NETOBJS) AC_SUBST(DEPLIBS) -AM_GNU_GETTEXT([no-libtool], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT([external], [need-ngettext]) +AM_GNU_GETTEXT_VERSION(0.15) dnl Check for Redhat spopen problem dnl Wierd problem where ECHILD is returned from a wait call in error @@ -1735,15 +1488,18 @@ elif test "$ac_cv_enable_redhat_pthread_workaround" = "yes" ; then fi dnl External libraries - see ACKNOWLEDGEMENTS -np_COREUTILS -np_CURL +gl_INIT + +dnl Some helpful common compile errors checked here +if test "$ac_cv_uname_s" = 'SunOS' -a "$ac_cv_prog_ac_ct_AR" = 'false' ; then + AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?) +fi AC_OUTPUT( Makefile lib/Makefile - m4/Makefile plugins/Makefile - plugins/tests/Makefile + lib/tests/Makefile plugins-root/Makefile plugins-scripts/Makefile plugins-scripts/subst @@ -1752,7 +1508,6 @@ AC_OUTPUT( command.cfg test.pl pkg/solaris/pkginfo - intl/Makefile po/Makefile.in ) @@ -1761,11 +1516,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]) @@ -1776,22 +1531,18 @@ dnl ACX_FEATURE([with],[snmpgetnext-command]) dnl ACX_FEATURE([with],[ssh-command]) dnl ACX_FEATURE([with],[uptime-command]) -dnl ACX_FEATURE([with],[proc-loadavg]) dnl ACX_FEATURE([with],[proc-meminfo]) dnl ACX_FEATURE([with],[ps-command]) dnl ACX_FEATURE([with],[ps-format]) dnl ACX_FEATURE([with],[ps-cols]) dnl ACX_FEATURE([with],[ps-varlist]) -ACX_FEATURE([with],[lwres]) ACX_FEATURE([with],[ipv6]) +ACX_FEATURE([with],[mysql]) ACX_FEATURE([with],[openssl]) ACX_FEATURE([with],[gnutls]) -ACX_FEATURE([enable],[emulate-getaddrinfo]) ACX_FEATURE([with],[perl]) ACX_FEATURE([with],[cgiurl]) -ACX_FEATURE([with],[nagios-user]) -ACX_FEATURE([with],[nagios-group]) ACX_FEATURE([with],[trusted-path])