![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/configure.in b/configure.in
index 03cec2f28e3a10ce06bc16840efa8e3488456185..bdd443141e89719a3b5cbfb5754cdde52e860193 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.59)
-AC_INIT(nagios-plugins,1.4.11)
+AC_INIT(nagios-plugins,1.4.15)
AC_CONFIG_SRCDIR(NPTest.pm)
AC_CONFIG_FILES(gl/Makefile)
AC_CONFIG_AUX_DIR(build-aux)
AC_SUBST(REV_DATESTAMP)
AC_SUBST(REV_TIMESTAMP)
+dnl Check if version file is present
+AM_CONDITIONAL([RELEASE_PRESENT], [test -f $srcdir/release])
+
+# Also read in the version from it
+if test -f $srcdir/release; then
+ NP_RELEASE="$(<release)"
+else
+ NP_RELEASE="$PACKAGE_VERSION"
+fi
+AC_SUBST(NP_RELEASE)
+
dnl Checks for programs.
AC_PATH_PROG(PYTHON,python)
AC_PATH_PROG(SH,sh)
dnl openssl/gnutls
AC_ARG_WITH(openssl,
- AC_HELP_STRING([--with-openssl=DIR],
+ AC_HELP_STRING([--with-openssl=DIR],
[path to openssl installation]),)
AC_ARG_WITH(gnutls,
AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
AC_SUBST(MATHLIBS)
-dnl Check for libtap, to run perl-like tests
-AC_CHECK_LIB(tap, plan_tests,
+dnl Check if we buils local libtap
+AC_ARG_ENABLE(libtap,
+ AC_HELP_STRING([--enable-libtap],
+ [Enable built-in libtap for unit-testing (default: autodetect system library).]),
+ [enable_libtap=$enableval],
+ [enable_libtap=no])
+AM_CONDITIONAL([USE_LIBTAP_LOCAL],[test "$enable_libtap" = "yes"])
+
+# If not local, check if we can use the system one
+if test "$enable_libtap" != "yes" ; then
+ dnl Check for libtap, to run perl-like tests
+ AC_CHECK_LIB(tap, plan_tests,
+ enable_libtap="yes"
+ )
+fi
+
+# Finally, define tests if we use libtap
+if test "$enable_libtap" = "yes" ; then
EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
AC_SUBST(EXTRA_TEST)
- )
+fi
dnl INI Parsing
AC_ARG_ENABLE(extra-opts,
- AC_HELP_STRING([--enable-extra-opts],
+ AC_HELP_STRING([--enable-extra-opts],
[Enables parsing of plugins ini config files for extra options (default: no)]),
[enable_extra_opts=$enableval],
[enable_extra_opts=no])
AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
if test "$enable_extra_opts" = "yes" ; then
- EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
- AC_SUBST(EXTRA_TEST)
AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
+ if test "$enable_libtap" = "yes"; then
+ EXTRA_TEST="$EXTRA_TEST test_ini1 test_ini3 test_opts1 test_opts2 test_opts3"
+ AC_SUBST(EXTRA_TEST)
+ fi
fi
dnl Check for PostgreSQL libraries
if test "$FOUNDINCLUDE" = "yes" ; then
EXTRAS="$EXTRAS check_ide_smart"
else
- AC_MSG_WARN([Skipping check_ide_smart plugin.])
- AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.])
+ AC_MSG_WARN([Skipping check_ide_smart plugin.])
+ AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.])
fi
dnl Check for mysql libraries
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_SIGNAL
-AC_TYPE_MBSTATE_T
AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
AC_TRY_LINK([#include <stdarg.h>
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])
-else
+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_MSG_CHECKING(for ps syntax)
AC_ARG_WITH(ps_command,
- ACX_HELP_STRING([--with-ps-command=PATH],
+ ACX_HELP_STRING([--with-ps-command=PATH],
[Verbatim command to execute for ps]),
PS_COMMAND=$withval)
AC_ARG_WITH(ps_format,
[Format string for scanning ps output]),
PS_FORMAT=$withval)
AC_ARG_WITH(ps_cols,
- ACX_HELP_STRING([--with-ps-cols=NUM],
+ ACX_HELP_STRING([--with-ps-cols=NUM],
[Number of columns in ps command]),
PS_COLS=$withval)
AC_ARG_WITH(ps_varlist,
[Variable list for sscanf of 'ps' output]),
PS_VARLIST=$withval)
-if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then
+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"
ac_cv_ps_varlist="$PS_VARLIST"
ac_cv_ps_cols=9
AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris])
if test `isainfo -b` = 64 ; then
- PST3CFLAGS="-m64"
- AC_SUBST(PST3CFLAGS)
- AC_MSG_NOTICE([using 64bit pst3])
+ pst3_use_64bit=1
+ AC_MSG_NOTICE([using 64bit pst3])
else
AC_MSG_NOTICE([using 32bit pst3])
fi
EXTRAS_ROOT="$EXTRAS_ROOT pst3"
+ if test "$pst3_use_64bit" = 1; then
+ dnl Test if we can actually compile code in 64bit
+ old_cflags=$CFLAGS
+ CFLAGS="$CFLAGS -m64"
+ pst3_64bit_working=0
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([], [
+return sizeof(void*) == 8 ? 0 : 1;
+ ])
+ ],[
+ PST3CFLAGS="-m64"
+ AC_SUBST(PST3CFLAGS)
+ pst3_64bit_working=1
+ AC_MSG_NOTICE([using -m64 for 64bit code])
+ ],[
+ pst3_64bit_working=0
+ AC_MSG_NOTICE([compiler do not like -m64])
+ ])
+ CFLAGS=$old_cflags
+ if test "$pst3_64bit_working" = 0; then
+ old_cflags=$CFLAGS
+ CFLAGS="$CFLAGS -xarch=v9"
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([], [
+return sizeof(void*) == 8 ? 0 : 1;
+ ])
+ ],[
+ PST3CFLAGS="-xarch=v9"
+ AC_SUBST(PST3CFLAGS)
+ pst3_64bit_working=1
+ AC_MSG_NOTICE([using -xarch=v9 for 64bit code])
+ ],[
+ pst3_64bit_working=0
+ AC_MSG_NOTICE([compiler do not like -xarch=v9])
+ ])
+ CFLAGS=$old_cflags
+ fi
+ if test "$pst3_64bit_working" = 0; then
+ old_cflags=$CFLAGS
+ CFLAGS="$CFLAGS -xarch=amd64"
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([], [
+return sizeof(void*) == 8 ? 0 : 1;
+ ])
+ ],[
+ PST3CFLAGS="-xarch=amd64"
+ AC_SUBST(PST3CFLAGS)
+ pst3_64bit_working=1
+ AC_MSG_NOTICE([using -xarch=amd64 for 64bit code])
+ ],[
+ pst3_64bit_working=0
+ AC_MSG_NOTICE([compiler do not like -xarch=amd64])
+ ])
+ CFLAGS=$old_cflags
+ fi
+ if test "$pst3_64bit_working" = 0; then
+ AC_MSG_ERROR([I don't know how to build a 64-bit object!])
+ fi
+ fi
+
dnl Removing this for the moment - Ton
dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation
dnl Limitation that command name is not available
ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
+dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
dnl Limitation: Only first 16 chars returned for ucomm field
dnl Must come before ps -weo
elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
-dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
+dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
dnl Has /usr/bin/ps and /sbin/ps - force sbin version
-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
+dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
dnl of 1500). Will need big changes to check_procs to support
elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
-dnl UnixWare
+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
if test -n "$with_ping_command"
then
AC_MSG_RESULT([(command-line) $with_ping_command])
- if test -n "$ac_cv_ping_packets_first"
+ if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
then
ac_cv_ping_packets_first=yes
ac_cv_ping_has_timeout=yes
+ elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
+ echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
+ then
+ ac_cv_ping_has_timeout=yes
+ elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
+ then
+ ac_cv_ping_packets_first=yes
fi
elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
- with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+ with_ping_command="$PATH_TO_PING -n -U -c %d %s"
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"
+ 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
- with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+ with_ping_command="$PATH_TO_PING -n -U -c %d %s"
ac_cv_ping_packets_first=yes
AC_MSG_RESULT([$with_ping_command])
if test -n "$with_ping6_command"
then
AC_MSG_RESULT([(command-line) $with_ping6_command])
- if test -n "$ac_cv_ping6_packets_first"
+ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
+ then
+ ac_cv_ping6_packets_first=yes
+ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
+ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
+ then
+ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
+ true
+ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
then
ac_cv_ping6_packets_first=yes
fi
$PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
AC_MSG_RESULT([$with_ping6_command])
$PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
AC_MSG_RESULT([$with_ping6_command])
elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
egrep -i "^round-trip|^rtt" >/dev/null
then
- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
ac_cv_ping6_packets_first=yes
AC_MSG_RESULT([$with_ping6_command])
AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient)
AC_ARG_WITH(smbclient_command,
ACX_HELP_STRING([--with-smbclient-command=PATH],
- [sets path to smbclient]),
+ [sets path to smbclient]),
PATH_TO_SMBCLIENT=$withval)
if test -n "$PATH_TO_SMBCLIENT"
then
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
AC_ARG_WITH(qstat_command,
- ACX_HELP_STRING([--with-qstat-command=PATH],
+ ACX_HELP_STRING([--with-qstat-command=PATH],
[Path to qstat command]), PATH_TO_QSTAT=$withval)
if test -x "$PATH_TO_QUAKESTAT"
AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin])
fi
-if test $ac_cv_path_to_qstat
+if test $ac_cv_path_to_qstat
then
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
[path to qstat/quakestat])
AC_CHECK_DECLS([swapctl],,,[
#include <unistd.h>
#include <sys/types.h>
- #include <sys/param.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/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";
+ #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";
+ "$ac_cv_type_swapent_t" = "yes";
then
AC_MSG_RESULT([yes])
ac_cv_check_swap_swapctl_svr4="1";
else
AC_MSG_RESULT([no])
AC_MSG_CHECKING([for 3-arg (*BSD) swapctl])
- if test "$ac_cv_member_struct_swapent_se_nblks" = "yes";
+ if test "$ac_cv_member_struct_swapent_se_nblks" = "yes";
then
AC_MSG_RESULT([yes])
AC_DEFINE([CHECK_SWAP_SWAPCTL_BSD],1,
dnl
-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])
EXTRAS="$EXTRAS check_swap"
fi
-if test "x$ac_cv_swap_command" != "x"
+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_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]),
+ [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])
fi
-if test -f plugins/check_nt.c ; then
- EXTRAS="$EXTRAS check_nt"
-elif test -f ../plugins/check_nt.c ; then
+if test -f $srcdir/plugins/check_nt.c ; then
EXTRAS="$EXTRAS check_nt"
fi
*sun* | *solaris*)
AC_DEFINE(__sun__,1,[sun specific code in check_dhcp.c])
;;
- *hpux*)
+ *hpux*)
AC_DEFINE(__hpux__,1,[hpux specific code in check_dhcp.c])
;;
esac
dnl We patch plugins/popen.c
dnl Need to add smp because uname different on those
dnl Can force patch to be applied with --enable-redhat-pthread-workaround
-AC_ARG_ENABLE(redhat-pthread-workaround,
- AC_HELP_STRING([--enable-redhat-pthread-workaround],
+AC_ARG_ENABLE(redhat-pthread-workaround,
+ AC_HELP_STRING([--enable-redhat-pthread-workaround],
[force Redhat patch to be applied (default: test system)]),
[ac_cv_enable_redhat_pthread_workaround=$enableval],
[ac_cv_enable_redhat_pthread_workaround=test])
dnl Perl modules
AC_ARG_ENABLE(perl-modules,
- AC_HELP_STRING([--enable-perl-modules],
+ AC_HELP_STRING([--enable-perl-modules],
[Enables installation of Nagios::Plugin and its dependencies (default: no)]),
[enable_perl_modules=$enableval],
[enable_perl_modules=no])
AC_SUBST(PERLMODS_DIR,perlmods)
fi
+# From Tap configure
+# Checks for libraries
+case "$host" in
+ *-*-*freebsd4*)
+ LDFLAGS="$LDFLAGS -pthread"
+ HAVE_LIBPTHREAD=1
+ ;;
+ *)
+ AC_CHECK_LIB(pthread, main)
+ ;;
+esac
+
dnl External libraries - see ACKNOWLEDGEMENTS
gl_INIT
@@ -1596,24 +1707,25 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c
fi
AC_OUTPUT(
- Makefile
- lib/Makefile
- plugins/Makefile
+ Makefile
+ tap/Makefile
+ lib/Makefile
+ plugins/Makefile
lib/tests/Makefile
plugins-root/Makefile
- plugins-scripts/Makefile
- plugins-scripts/subst
- plugins-scripts/utils.pm
- plugins-scripts/utils.sh
+ plugins-scripts/Makefile
+ plugins-scripts/subst
+ plugins-scripts/utils.pm
+ plugins-scripts/utils.sh
perlmods/Makefile
- command.cfg
- test.pl
- pkg/solaris/pkginfo
- po/Makefile.in
+ command.cfg
+ test.pl
+ pkg/solaris/pkginfo
+ po/Makefile.in
)
-dnl the ones below that are commented out need to be cleaned up
+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([enable],[perl-modules])
ACX_FEATURE([with],[cgiurl])
ACX_FEATURE([with],[trusted-path])
-
+ACX_FEATURE([enable],[libtap])