Imported Upstream version 1.4.14

2013-11-26 23:57:14 +01:00 · 2013-11-26 23:57:14 +01:00 · 882cdeecca
parent d0b8ab8112
commit 882cdeecca
75 changed files with 12919 additions and 9125 deletions
--- a/15
+++ b/15
@ -2,10 +2,16 @@ This file lists the major bugs from the Nagios Plugins page on Sourceforge
 at http://sourceforge.net/tracker/?group_id=29880&atid=397597. These are not
 necessarily verified as errors.
-For the 1.4.13 release:
+For the 1.4.14 release:
 2832451 - check_snmp regression parsing multi-line snmpget responses
 2826570 - check_http does not work with some HTTPS servers
 2823005 - check_swap returns OK if no swap activated
 2786808 - check_http asks for HTTP/1.1, but doesn't understand chunked
 2555782 - check_imap fails with SSL3
 2550254 - check_ldap with starttls requires hostname to match cert name
 2315953 - check_ping: timeouts when reverse name resolution times out
 2075933 - check_disk segfault on freebsd 7 if using -p option
 1985263 - check_ups doesn't disconnect cleanly
 1984255 - check_swap not built on Solaris 10 and HP-UX 11.11, 11.23
 1984240 - check_tcp Segmentation fault on HP-UX 11.23
 1939578 - check_jabber: Always returns WARNING with Openfire server
@ -14,19 +20,14 @@ For the 1.4.13 release:
 1922579 - check_ldap: ldap_init implicitly converted
 1904965 - check_apt: SECURITY_RE is not correct
 1894850 - check_ping: incorrectly parses ping6 output
 1868822 - check_http link fails with openssl installed
 1864404 - check_smtp/check_http miscalculate timezones in cert expiry
 1681516 - output too verbose for various checks
 1670261 - check_snmp might require snmpget with LD_LIBRARY_PATH
 1523748 - check_disk should error if warn range is subset of critical
 1478287 - check_dns fails with CNAMEs
 1469468 - signal handler in popen.c is broken
 1381604 - Perlsec breaks any perl plugin with perl 5.8.x
 1373801 - check_ping timeout on Mandrake 10.1
 1370031 - check_disk_smb requires DNS agree with NetBIOS names
 1250982 - check_postgresql: configure test for -lcrypto on OpenBSD
 1225470 - check_swap perf data incorrect
 1108499 - check_ping with -U on Debian fails
 1090549 - check_dhcp ignores DHCP replies
 990948 - check_disk_smb doesn't allow spaces in share names
--- a/18702
+++ b/18702
--- a/50
+++ b/50
@ -1,8 +1,8 @@
 Installation Instructions
 *************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-Software Foundation, Inc.
+2006 Free Software Foundation, Inc.
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@ -23,9 +26,9 @@ debugging `configure').
   It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
   If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
+`configure' by a program called `autoconf'.  You need `configure.ac' if
-`configure.ac' if you want to change it or regenerate `configure' using
+you want to change it or regenerate `configure' using a newer version
-a newer version of `autoconf'.
+of `autoconf'.
 The simplest way to compile this package is:
  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
+     `./configure' to configure the package for your system.
     using `csh' on an old version of System V, you might need to type
     `sh ./configure' instead to prevent `csh' from trying to execute
     `configure' itself.
-     Running `configure' takes awhile.  While running, it prints some
+     Running `configure' might take a while.  While running, it prints
-     messages telling which features it is checking for.
+     some messages telling which features it is checking for.
  2. Type `make' to compile the package.
@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
 by setting variables in the command line or in the environment.  Here
 is an example:
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
   *Note Defining Variables::, for more details.
@ -87,17 +87,15 @@ Compiling For Multiple Architectures
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
-   If you have to use a `make' that does not support the `VPATH'
+   With a non-GNU `make', it is safer to compile the package for one
-variable, you have to compile the package for one architecture at a
+architecture at a time in the source code directory.  After you have
-time in the source code directory.  After you have installed the
+installed the package for one architecture, use `make distclean' before
-package for one architecture, use `make distclean' before reconfiguring
+reconfiguring for another architecture.
 for another architecture.
 Installation Names
 ==================
@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'.  For example:
     ./configure CC=/usr/local2/bin/gcc
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
 an Autoconf bug.  Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 configuration-related scripts to be executed by `/bin/bash'.
 `configure' Invocation
 ======================
--- a/Makefile.in
+++ b/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -13,13 +13,10 @@
 # PARTICULAR PURPOSE.
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -34,6 +31,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/command.cfg.in \
 	$(srcdir)/config.h.in $(srcdir)/test.pl.in \
@ -43,7 +41,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
 	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
 	build-aux/mkinstalldirs config.rpath mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 $(top_srcdir)/gl/m4/alloca.m4 \
@ -119,7 +116,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = command.cfg test.pl pkg/solaris/pkginfo
@ -127,10 +124,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
+	install-dvi-recursive install-exec-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
+	install-html-recursive install-info-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
-	uninstall-recursive
+	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@ -145,12 +145,9 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -205,8 +202,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -487,6 +482,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -517,6 +513,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -587,8 +584,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -685,11 +680,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -700,13 +691,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -718,6 +709,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -751,8 +743,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
 SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 EXTRA_DIST = config.rpath \
@ -810,7 +805,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@ -838,7 +833,6 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@ -871,8 +865,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
+$(RECURSIVE_CLEAN_TARGETS):
 maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@ -974,24 +967,22 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
+	test -d $(distdir) || mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/build-aux $(distdir)/config_test $(distdir)/gl/m4 $(distdir)/m4 $(distdir)/pkg/solaris $(distdir)/plugins-scripts $(distdir)/po $(distdir)/tools
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	  case $$file in \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -1005,7 +996,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@ -1013,6 +1004,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@ -1023,7 +1016,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@ -1098,7 +1091,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@ -1168,12 +1161,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-recursive
 install-exec-am:
 install-html: install-html-recursive
 install-info: install-info-recursive
 install-man:
 install-pdf: install-pdf-recursive
 install-ps: install-ps-recursive
 installcheck-am:
 maintainer-clean: maintainer-clean-recursive
@ -1194,24 +1195,26 @@ ps: ps-recursive
 ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	check-am clean clean-generic clean-libtool clean-recursive \
+	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean-generic distclean-hdr distclean-libtool \
+	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-am \
-	install install-am install-data install-data-am install-exec \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-exec-am install-info install-info-am install-man \
+	install-exec install-exec-am install-html install-html-am \
-	install-strip installcheck installcheck-am installdirs \
+	install-info install-info-am install-man install-pdf \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	install-pdf-am install-ps install-ps-am install-strip \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	installcheck installcheck-am installdirs installdirs-am \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am
 dist-hook:
--- a/3
+++ b/3
@ -1,6 +1,6 @@
 This file documents the major additions and syntax changes between releases.
-1.4.14 ...
+1.4.14 16th September 2009
 	check_http has options to specify the HTTP method (#2155152)
 	check_users thresholds were not working exactly as documented (>= rather than >)
 	Updated tinderbox_build script to point to new tinderbox server
@ -41,6 +41,7 @@ This file documents the major additions and syntax changes between releases.
 	check_fping now supports passing target timeout and interval to fping (#2347686 - Martin Foster)
 	Fixed SNMPv3 behaviour of check_ifoperstatus and check_ifstatus. Added -P to define privprotocol (#2343438 - Robin Schroeder)
 	check_ifoperstatus and check_ifstatus are now more user-friendly in case of missing arguments
 	pst3 compile fix for Sun Studio Compiler (Grant Byers)
 1.4.13 25th Sept 2008
 	Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
--- a/2
+++ b/2
@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 NPVF=NP-VERSION-FILE
-DEF_VER=1.4.13.git
+DEF_VER=1.4.14.git
 LF='
 '
--- a/7
+++ b/7
@ -2,8 +2,8 @@ This software is brought to you by the Nagios Plugins Development Team. However,
 there have been many contributors to this project. Everyone below has helped in 
 raising bug reports, creating patches or contributing new plugins.
 dag rob?le
 fabiodds
 dag rob?le
 Randy O'Meara
 Oskar Ahner
 Lance Albertson
@ -40,6 +40,7 @@ Richard Brodie
 Matthew Brown
 Dick van den Burg
 Jason Burnett
 Grant Byers
 Carlos Canau
 Jim Carroll
 Ian Cass
@ -48,8 +49,8 @@ Alex Chaffee
 Eric Chen
 Alwyn Cherrington
 Ben Clewett
 Charlie Cook
 Garry Cook
 Charlie Cook
 Ollie Cook
 Jason Crawford
 David Croft
@ -89,8 +90,8 @@ Felix Frank
 Rick Frey
 Matt Garrett
 Robby Giffin
 Florian Gleixner
 Flo Gleixner
 Florian Gleixner
 Aravind Gottipati
 Kev Green
 Steve Greenland
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -11,9 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 m4_if(m4_PACKAGE_VERSION, [2.61],,
 [m4_fatal([this file was generated for autoconf 2.61.
 You have another version of autoconf.  If you want to use that,
 you should regenerate the build system entirely.], [63])])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@ -1370,7 +1375,7 @@ darwin* | rhapsody*)
  version_type=darwin
  need_lib_prefix=no
  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
  soname_spec='${libname}${release}${major}$shared_ext'
  shlibpath_overrides_runpath=yes
  shlibpath_var=DYLD_LIBRARY_PATH
@ -1397,6 +1402,18 @@ freebsd1*)
  dynamic_linker=no
  ;;
 kfreebsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  dynamic_linker='GNU ld.so'
  ;;
 freebsd* | dragonfly*)
  # DragonFly does not have aout.  When/if they implement a new
  # versioning mechanism, adjust this.
@ -1552,7 +1569,7 @@ linux*oldld* | linux*aout* | linux*coff*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -1581,7 +1598,7 @@ linux* | k*bsd*-gnu)
  dynamic_linker='GNU/Linux ld.so'
  ;;
-netbsdelf*-gnu)
+knetbsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -1590,7 +1607,7 @@ netbsdelf*-gnu)
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
+  dynamic_linker='GNU ld.so'
  ;;
 netbsd*)
@ -2298,7 +2315,7 @@ darwin* | rhapsody*)
  lt_cv_deplibs_check_method=pass_all
  ;;
-freebsd* | dragonfly*)
+freebsd* | kfreebsd*-gnu | dragonfly*)
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
    case $host_cpu in
    i*86 )
@ -2352,11 +2369,11 @@ irix5* | irix6* | nonstopux*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  lt_cv_deplibs_check_method=pass_all
  ;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
  else
@ -3104,7 +3121,7 @@ case $host_os in
  freebsd-elf*)
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
    ;;
-  freebsd* | dragonfly*)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
    # conventions
    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@ -3263,7 +3280,7 @@ case $host_os in
    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
    ;;
-  linux* | k*bsd*-gnu)
+  linux*)
    case $cc_basename in
      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@ -3365,7 +3382,7 @@ case $host_os in
 	;;
    esac
    ;;
-  netbsd* | netbsdelf*-gnu)
+  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
      wlarc=
@ -4630,7 +4647,7 @@ hpux*) # Its linker distinguishes data from code symbols
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
  ;;
-linux* | k*bsd*-gnu)
+linux*)
  if test "$host_cpu" = ia64; then
    symcode='[[ABCDGIRSTW]]'
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@ -4903,7 +4920,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
      hpux9* | hpux10* | hpux11*)
@ -4946,7 +4963,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@ -4989,7 +5006,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
      osf3* | osf4* | osf5*)
 	case $cc_basename in
@ -5200,7 +5217,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      case $cc_basename in
      icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@ -5341,9 +5358,6 @@ ifelse([$1],[CXX],[
  cygwin* | mingw*)
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
  ;;
  linux* | k*bsd*-gnu)
    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
  ;;
  *)
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  ;;
@ -5514,7 +5528,7 @@ EOF
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@ -5540,13 +5554,12 @@ EOF
  $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
      else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@ -5876,7 +5889,7 @@ _LT_EOF
      ;;
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@ -5978,7 +5991,7 @@ _LT_EOF
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
      else
@ -6380,7 +6393,7 @@ SED=$lt_cv_path_SED
 AC_MSG_RESULT([$SED])
 ])
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -6390,14 +6403,29 @@ AC_MSG_RESULT([$SED])
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
 m4_if([$1], [1.10], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 # _AM_AUTOCONF_VERSION(VERSION)
 # -----------------------------
 # aclocal traces this macro to find the Autoconf version.
 # This is a private macro too.  Using m4_define simplifies
 # the logic in aclocal, which can simply ignore this definition.
 m4_define([_AM_AUTOCONF_VERSION], [])
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
 _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
@ -6454,14 +6482,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 # AM_CONDITIONAL                                            -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@ -6470,8 +6498,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
 ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
+AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
  $1_TRUE=
  $1_FALSE='#'
@ -6485,15 +6515,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
-
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@ -6521,6 +6550,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                   [depcc="$$1"   am_compiler_list=])
@ -6586,6 +6616,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
         >/dev/null 2>conftest.err &&
       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -6638,7 +6669,8 @@ if test "x$enable_dependency_tracking" != xno; then
  AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@ -6663,8 +6695,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  # some people rename them; so instead we look at the file content.
  # Grep'ing the first line is not enough: some people post-process
  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
+  # Grep'ing the whole file is not good either: AIX grep has a line
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # limit of 2048, but all sed's we know have understand at least 4000.
  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
    dirpart=`AS_DIRNAME("$mf")`
  else
    continue
@ -6723,8 +6756,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # Do all the work for Automake.                             -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -6747,16 +6780,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-   test -f $srcdir/config.status; then
+  # is not polluted with repeated "-I."
  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
  # test to see if srcdir already configured
  if test -f $srcdir/config.status; then
    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
  fi
 fi
 # test whether we have cygpath
@ -6776,6 +6813,9 @@ m4_ifval([$2],
 AC_SUBST([PACKAGE], [$1])dnl
 AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@ -6811,6 +6851,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                  [_AM_DEPENDENCIES(CXX)],
                  [define([AC_PROG_CXX],
                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
                  [_AM_DEPENDENCIES(OBJC)],
                  [define([AC_PROG_OBJC],
                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
@ -6846,7 +6890,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@ -6922,13 +6966,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
-# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 5
 # AM_PROG_CC_C_O
 # --------------
@ -6936,6 +6981,7 @@ rm -f confinc confmf
 AC_DEFUN([AM_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC_C_O])dnl
 AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([compile])dnl
 # FIXME: we rely on the cache variable name because
 # there is no other way.
 set dummy $CC
@ -6948,18 +6994,22 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
   CC="$am_aux_dir/compile $CC"
 fi
 dnl Make sure AC_PROG_CC is never called again, or it will override our
 dnl setting of CC.
 m4_define([AC_PROG_CC],
          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
 ])
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@ -6975,6 +7025,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@ -6985,7 +7036,7 @@ else
 fi
 ])
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -6993,60 +7044,23 @@ fi
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+# Check for `mkdir -p'.
 #
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
 # This was a mistake.  There are at least two reasons why we must not
 # use `-m 0755':
 #   - it causes special bits like SGID to be ignored,
 #   - it may be too restrictive (some setups expect 775 directories).
 #
 # Do not use -m 0755 and let people choose whatever they expect by
 # setting umask.
 #
 # We cannot accept any implementation of `mkdir' that recognizes `-p'.
 # Some implementations (such as Solaris 8's) are not thread-safe: if a
 # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
 # concurrently, both version can detect that a/ is missing, but only
 # one can create it and the other will error out.  Consequently we
 # restrict ourselves to GNU make (using the --version option ensures
 # this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+[AC_PREREQ([2.60])dnl
-  # We used to keeping the `.' as first argument, in order to
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  # allow $(mkdir_p) to be used without argument.  As in
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-  #   $(mkdir_p) $(somedir)
+dnl while keeping a definition of mkdir_p for backward compatibility.
-  # where $(somedir) is conditionally defined.  However this is wrong
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-  # for two reasons:
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-  #  1. if the package is installed by a user who cannot write `.'
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-  #     make install will fail,
+dnl adjustment using top_builddir (which is defined more often than
-  #  2. the above comment should most certainly read
+dnl MKDIR_P).
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-  #     so it does not work when $(somedir) is undefined and
+case $mkdir_p in
-  #     $(DESTDIR) is not.
+  [[\\/$]]* | ?:[[\\/]]*) ;;
-  #  To support the latter case, we have to write
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+esac
-  #  so the `.' trick is pointless.
+])
  mkdir_p='mkdir -p --'
 else
  # On NextStep and OpenStep, the `mkdir' command does not
  # recognize any option.  It will interpret all options as
  # directories to create, and then abort because `.' already
  # exists.
  for d in ./-p ./--version;
  do
    test -d $d && rmdir $d
  done
  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
  if test -f "$ac_aux_dir/mkinstalldirs"; then
    mkdir_p='$(mkinstalldirs)'
  else
    mkdir_p='$(install_sh) -d'
  fi
 fi
 AC_SUBST([mkdir_p])])
 # Helper functions for option handling.                     -*- Autoconf -*-
@ -7158,9 +7172,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
  AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # Copyright (C) 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Check how to create a tarball.                            -*- Autoconf -*-
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -276,6 +276,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@ -284,7 +285,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@ -367,7 +368,7 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
@ -909,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
 	sde)
 		basic_machine=mipsisa32-sde
 		os=-elf
 		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@ -1366,6 +1371,9 @@ else
 # system, and we'll never get to this point.
 case $basic_machine in
        score-*)
 		os=-elf
 		;;
        spu-*)
 		os=-elf
 		;;
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -91,7 +92,20 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
  if test $stat -eq 0; then :
  else
@ -276,6 +290,46 @@ icc)
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add `dependent.h:' lines.
    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
  else
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -288,13 +342,13 @@ tru64)
   if test "$libtool" = yes; then
      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
+
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@ -95,7 +110,7 @@ Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
-while test -n "$1"; do
+while test $# -ne 0; do
  case $1 in
    -c) shift
        continue;;
@ -111,9 +126,15 @@ while test -n "$1"; do
    --help) echo "$usage"; exit $?;;
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
        shift
        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
        continue;;
    -o) chowncmd="$chownprog $2"
@ -136,9 +157,19 @@ while test -n "$1"; do
    --version) echo "$0 $scriptversion"; exit $?;;
-    *)  # When -d is used, all remaining arguments are directories to create.
+    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
 done
 if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
 	test -n "$dir_arg$dstarg" && break
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
@ -150,11 +181,9 @@ while test -n "$1"; do
    shift # arg
    dstarg=$arg
  done
-	break;;
+fi
  esac
 done
-if test -z "$1"; then
+if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
@ -164,6 +193,33 @@ if test -z "$1"; then
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
@ -173,15 +229,11 @@ do
  if test -n "$dir_arg"; then
    dst=$src
-    src=
+    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    if test -d "$dst"; then
      mkdircmd=:
      chmodcmd=
    else
      mkdircmd=$mkdirprog
    fi
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
@ -208,53 +260,188 @@ do
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
      fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
-  # This sed command emulates the dirname command.
+  obsolete_mkdir_used=false
  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-  # Make sure that the destination directory exists.
+  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-  # Skip lots of stat calls in the usual case.
+	  *[0-7])
-  if test ! -d "$dstdir"; then
+	    mkdir_umask=`expr $umask + 22 \
-    defaultIFS='
+	      - $umask % 100 % 40 + $umask % 20 \
-	 '
+	      - $umask % 10 % 4 + $umask % 2
-    IFS="${IFS-$defaultIFS}"
+	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix=/ ;;
 	-*) prefix=./ ;;
 	*)  prefix= ;;
      esac
      case $posix_glob in
        '')
 	  if (set -f) 2>/dev/null; then
 	    posix_glob=true
 	  else
 	    posix_glob=false
 	  fi ;;
      esac
      oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
+      IFS=/
-    IFS='%'
+      $posix_glob && set -f
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+      set fnord $dstdir
      shift
      $posix_glob && set +f
      IFS=$oIFS
-    pathcomp=
+      prefixes=
-    while test $# -ne 0 ; do
+      for d
-      pathcomp=$pathcomp$1
+      do
-      shift
+	test -z "$d" && continue
-      if test ! -d "$pathcomp"; then
+
-        $mkdirprog "$pathcomp"
+	prefix=$prefix$d
-	# mkdir can fail with a `File exist' error in case several
+	if test -d "$prefix"; then
-	# install-sh are creating the directory concurrently.  This
+	  prefixes=
-	# is OK.
+	else
-	test -d "$pathcomp" || exit
+	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
-      pathcomp=$pathcomp/
+	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
  else
    dstfile=`basename "$dst"`
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
@ -262,10 +449,9 @@ do
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    trap '(exit $?); exit' 1 2 13 15
    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
@ -276,10 +462,10 @@ do
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
      || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@ -291,11 +477,12 @@ do
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
+	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
 		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@ -304,16 +491,13 @@ do
 	   } &&
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
+    } || exit 1
  fi || { (exit 1); exit 1; }
 done
-# The final little trick to "correctly" pass the exit status to the exit trap.
+    trap '' 0
-{
+  fi
-  (exit 0); exit 0
+done
 }
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/build-aux/missing
+++ b/build-aux/missing
@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@ -44,7 +46,7 @@ fi
 msg="missing on your system"
-case "$1" in
+case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
@ -77,6 +79,7 @@ Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
  lex|yacc)
    # Not GNU programs, they don't have --version.
    ;;
@ -135,7 +138,7 @@ esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
  aclocal*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
-      case "$f" in
+      case $f in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
    fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    if test -z "$file"; then
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
      # ... or it is the one specified with @setfilename ...
      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
    fi
    firstarg="$1"
    if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
--- a/build-aux/mkinstalldirs
+++ b/build-aux/mkinstalldirs
@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-scriptversion=2005-06-29.22
+scriptversion=2006-05-11.19
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@ -11,6 +11,9 @@ scriptversion=2005-06-29.22
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 nl='
 '
 IFS=" ""	$nl"
 errstatus=0
 dirmode=
--- a/341
+++ b/341
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for nagios-plugins 1.4.13.
+# Generated by GNU Autoconf 2.61 for nagios-plugins 1.4.14.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='nagios-plugins'
 PACKAGE_TARNAME='nagios-plugins'
-PACKAGE_VERSION='1.4.13'
+PACKAGE_VERSION='1.4.14'
-PACKAGE_STRING='nagios-plugins 1.4.13'
+PACKAGE_STRING='nagios-plugins 1.4.14'
 PACKAGE_BUGREPORT=''
 ac_unique_file="NPTest.pm"
@ -811,6 +811,7 @@ target_alias
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
 am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@ -1899,7 +1900,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures nagios-plugins 1.4.13 to adapt to many kinds of systems.
+\`configure' configures nagios-plugins 1.4.14 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1969,7 +1970,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of nagios-plugins 1.4.13:";;
+     short | recursive ) echo "Configuration of nagios-plugins 1.4.14:";;
   esac
  cat <<\_ACEOF
@ -2123,7 +2124,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-nagios-plugins configure 1.4.13
+nagios-plugins configure 1.4.14
 generated by GNU Autoconf 2.61
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -2137,7 +2138,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by nagios-plugins $as_me 1.4.13, which was
+It was created by nagios-plugins $as_me 1.4.14, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  $ $0 $@
@ -2558,7 +2559,8 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-am__api_version="1.9"
+am__api_version='1.10'
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@ -2710,38 +2712,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-  # We used to keeping the `.' as first argument, in order to
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-  # allow $(mkdir_p) to be used without argument.  As in
+if test -z "$MKDIR_P"; then
-  #   $(mkdir_p) $(somedir)
+  if test "${ac_cv_path_mkdir+set}" = set; then
-  # where $(somedir) is conditionally defined.  However this is wrong
+  echo $ECHO_N "(cached) $ECHO_C" >&6
  # for two reasons:
  #  1. if the package is installed by a user who cannot write `.'
  #     make install will fail,
  #  2. the above comment should most certainly read
  #     $(mkdir_p) $(DESTDIR)$(somedir)
  #     so it does not work when $(somedir) is undefined and
  #     $(DESTDIR) is not.
  #  To support the latter case, we have to write
  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
  #  so the `.' trick is pointless.
  mkdir_p='mkdir -p --'
 else
-  # On NextStep and OpenStep, the `mkdir' command does not
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-  # recognize any option.  It will interpret all options as
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-  # directories to create, and then abort because `.' already
+do
-  # exists.
+  IFS=$as_save_IFS
-  for d in ./-p ./--version;
+  test -z "$as_dir" && as_dir=.
-  do
+  for ac_prog in mkdir gmkdir; do
-    test -d $d && rmdir $d
+	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
 	     'mkdir (fileutils) '4.1*)
 	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+       done
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+done
-    mkdir_p='$(mkinstalldirs)'
+IFS=$as_save_IFS
 fi
  if test "${ac_cv_path_mkdir+set}" = set; then
    MKDIR_P="$ac_cv_path_mkdir -p"
  else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
    # value for MKDIR_P within a source directory, because that will
    # break other packages using the cache if that directory is
    # removed, or if the value is a relative name.
    test -d ./--version && rmdir ./--version
    MKDIR_P="$ac_install_sh -d"
  fi
 fi
 { echo "$as_me:$LINENO: result: $MKDIR_P" >&5
 echo "${ECHO_T}$MKDIR_P" >&6; }
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
  [\\/$]* | ?:[\\/]*) ;;
  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
 esac
 for ac_prog in gawk mawk nawk awk
 do
@ -2824,12 +2841,16 @@ else
 fi
 rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-   test -f $srcdir/config.status; then
+  # is not polluted with repeated "-I."
  am__isrc=' -I$(srcdir)'
  # test to see if srcdir already configured
  if test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
   { (exit 1); exit 1; }; }
  fi
 fi
 # test whether we have cygpath
@ -2844,7 +2865,7 @@ fi
 # Define the identity of the package.
 PACKAGE='nagios-plugins'
- VERSION='1.4.13'
+ VERSION='1.4.14'
 cat >>confdefs.h <<_ACEOF
@ -2872,7 +2893,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@ -2976,7 +2997,7 @@ else
 fi
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@ -4082,9 +4103,7 @@ if test "x$enable_dependency_tracking" != xno; then
  am_depcomp="$ac_aux_dir/depcomp"
  AMDEPBACKSLASH='\'
 fi
-
+ if test "x$enable_dependency_tracking" != xno; then
 if test "x$enable_dependency_tracking" != xno; then
  AMDEP_TRUE=
  AMDEP_FALSE='#'
 else
@ -4094,7 +4113,6 @@ fi
 depcc="$CC"   am_compiler_list=
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@ -4162,6 +4180,7 @@ else
       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
         >/dev/null 2>conftest.err &&
       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -4191,9 +4210,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
+ if
 if
  test "x$enable_dependency_tracking" != xno \
  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
  am__fastdepCC_TRUE=
@ -5618,7 +5635,7 @@ darwin* | rhapsody*)
  lt_cv_deplibs_check_method=pass_all
  ;;
-freebsd* | dragonfly*)
+freebsd* | kfreebsd*-gnu | dragonfly*)
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
    case $host_cpu in
    i*86 )
@ -5672,11 +5689,11 @@ irix5* | irix6* | nonstopux*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  lt_cv_deplibs_check_method=pass_all
  ;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
  else
@ -5792,7 +5809,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5795 "configure"' > conftest.$ac_ext
+  echo '#line 5812 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -6542,6 +6559,7 @@ else
       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
         >/dev/null 2>conftest.err &&
       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -6571,9 +6589,7 @@ fi
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
+ if
 if
  test "x$enable_dependency_tracking" != xno \
  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
  am__fastdepCXX_TRUE=
@ -7239,7 +7255,7 @@ hpux*) # Its linker distinguishes data from code symbols
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
  ;;
-linux* | k*bsd*-gnu)
+linux*)
  if test "$host_cpu" = ia64; then
    symcode='[ABCDGIRSTW]'
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@ -8045,11 +8061,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8048: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8064: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:8052: \$? = $ac_status" >&5
+   echo "$as_me:8068: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -8207,7 +8223,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
      lt_prog_compiler_static='-Bstatic'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      case $cc_basename in
      icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@ -8313,11 +8329,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8316: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8332: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:8320: \$? = $ac_status" >&5
+   echo "$as_me:8336: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -8417,11 +8433,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8420: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8436: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:8424: \$? = $ac_status" >&5
+   echo "$as_me:8440: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -8646,7 +8662,7 @@ EOF
      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@ -8672,13 +8688,12 @@ EOF
  $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	link_all_deplibs=no
      else
 	ld_shlibs=no
      fi
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@ -9106,7 +9121,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      ;;
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
@ -9208,7 +9223,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      link_all_deplibs=yes
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
      else
@ -9671,7 +9686,7 @@ darwin* | rhapsody*)
  version_type=darwin
  need_lib_prefix=no
  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
  soname_spec='${libname}${release}${major}$shared_ext'
  shlibpath_overrides_runpath=yes
  shlibpath_var=DYLD_LIBRARY_PATH
@ -9698,6 +9713,18 @@ freebsd1*)
  dynamic_linker=no
  ;;
 kfreebsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  dynamic_linker='GNU ld.so'
  ;;
 freebsd* | dragonfly*)
  # DragonFly does not have aout.  When/if they implement a new
  # versioning mechanism, adjust this.
@ -9853,7 +9880,7 @@ linux*oldld* | linux*aout* | linux*coff*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -9882,7 +9909,7 @@ linux* | k*bsd*-gnu)
  dynamic_linker='GNU/Linux ld.so'
  ;;
-netbsdelf*-gnu)
+knetbsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -9891,7 +9918,7 @@ netbsdelf*-gnu)
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
+  dynamic_linker='GNU ld.so'
  ;;
 netbsd*)
@ -10714,7 +10741,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 10717 "configure"
+#line 10744 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@ -10814,7 +10841,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 10817 "configure"
+#line 10844 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@ -12127,7 +12154,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  freebsd-elf*)
    archive_cmds_need_lc_CXX=no
    ;;
-  freebsd* | dragonfly*)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
    # conventions
    ld_shlibs_CXX=yes
@ -12286,7 +12313,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
    hardcode_libdir_separator_CXX=:
    ;;
-  linux* | k*bsd*-gnu)
+  linux*)
    case $cc_basename in
      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@ -12388,7 +12415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
    esac
    ;;
-  netbsd* | netbsdelf*-gnu)
+  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
      wlarc=
@ -12955,7 +12982,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
      hpux9* | hpux10* | hpux11*)
@ -12998,7 +13025,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@ -13041,7 +13068,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
      osf3* | osf4* | osf5*)
 	case $cc_basename in
@ -13150,11 +13177,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13153: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13180: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:13157: \$? = $ac_status" >&5
+   echo "$as_me:13184: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -13254,11 +13281,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13257: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13284: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:13261: \$? = $ac_status" >&5
+   echo "$as_me:13288: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -13326,9 +13353,6 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
  cygwin* | mingw*)
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  ;;
  linux* | k*bsd*-gnu)
    link_all_deplibs_CXX=no
  ;;
  *)
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  ;;
@ -13581,7 +13605,7 @@ darwin* | rhapsody*)
  version_type=darwin
  need_lib_prefix=no
  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
  soname_spec='${libname}${release}${major}$shared_ext'
  shlibpath_overrides_runpath=yes
  shlibpath_var=DYLD_LIBRARY_PATH
@ -13608,6 +13632,18 @@ freebsd1*)
  dynamic_linker=no
  ;;
 kfreebsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  dynamic_linker='GNU ld.so'
  ;;
 freebsd* | dragonfly*)
  # DragonFly does not have aout.  When/if they implement a new
  # versioning mechanism, adjust this.
@ -13763,7 +13799,7 @@ linux*oldld* | linux*aout* | linux*coff*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -13792,7 +13828,7 @@ linux* | k*bsd*-gnu)
  dynamic_linker='GNU/Linux ld.so'
  ;;
-netbsdelf*-gnu)
+knetbsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -13801,7 +13837,7 @@ netbsdelf*-gnu)
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
+  dynamic_linker='GNU ld.so'
  ;;
 netbsd*)
@ -14709,7 +14745,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
      lt_prog_compiler_static_F77='-Bstatic'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      case $cc_basename in
      icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@ -14815,11 +14851,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14818: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14854: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:14822: \$? = $ac_status" >&5
+   echo "$as_me:14858: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -14919,11 +14955,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14922: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14958: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:14926: \$? = $ac_status" >&5
+   echo "$as_me:14962: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -15148,7 +15184,7 @@ EOF
      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@ -15174,13 +15210,12 @@ EOF
  $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	link_all_deplibs_F77=no
      else
 	ld_shlibs_F77=no
      fi
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@ -15588,7 +15623,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      ;;
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
      hardcode_libdir_flag_spec_F77='-R$libdir'
      hardcode_direct_F77=yes
@ -15690,7 +15725,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      link_all_deplibs_F77=yes
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
      else
@ -16153,7 +16188,7 @@ darwin* | rhapsody*)
  version_type=darwin
  need_lib_prefix=no
  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
  soname_spec='${libname}${release}${major}$shared_ext'
  shlibpath_overrides_runpath=yes
  shlibpath_var=DYLD_LIBRARY_PATH
@ -16180,6 +16215,18 @@ freebsd1*)
  dynamic_linker=no
  ;;
 kfreebsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  dynamic_linker='GNU ld.so'
  ;;
 freebsd* | dragonfly*)
  # DragonFly does not have aout.  When/if they implement a new
  # versioning mechanism, adjust this.
@ -16335,7 +16382,7 @@ linux*oldld* | linux*aout* | linux*coff*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -16364,7 +16411,7 @@ linux* | k*bsd*-gnu)
  dynamic_linker='GNU/Linux ld.so'
  ;;
-netbsdelf*-gnu)
+knetbsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -16373,7 +16420,7 @@ netbsdelf*-gnu)
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
+  dynamic_linker='GNU ld.so'
  ;;
 netbsd*)
@ -17106,11 +17153,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17109: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17156: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:17113: \$? = $ac_status" >&5
+   echo "$as_me:17160: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -17268,7 +17315,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
      lt_prog_compiler_static_GCJ='-Bstatic'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      case $cc_basename in
      icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@ -17374,11 +17421,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17377: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17424: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:17381: \$? = $ac_status" >&5
+   echo "$as_me:17428: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -17478,11 +17525,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17481: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17528: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:17485: \$? = $ac_status" >&5
+   echo "$as_me:17532: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -17707,7 +17754,7 @@ EOF
      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
-    linux* | k*bsd*-gnu)
+    linux*)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@ -17733,13 +17780,12 @@ EOF
  $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	link_all_deplibs_GCJ=no
      else
 	ld_shlibs_GCJ=no
      fi
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@ -18167,7 +18213,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      ;;
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
      hardcode_libdir_flag_spec_GCJ='-R$libdir'
      hardcode_direct_GCJ=yes
@ -18269,7 +18315,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      link_all_deplibs_GCJ=yes
      ;;
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
      else
@ -18732,7 +18778,7 @@ darwin* | rhapsody*)
  version_type=darwin
  need_lib_prefix=no
  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
  soname_spec='${libname}${release}${major}$shared_ext'
  shlibpath_overrides_runpath=yes
  shlibpath_var=DYLD_LIBRARY_PATH
@ -18759,6 +18805,18 @@ freebsd1*)
  dynamic_linker=no
  ;;
 kfreebsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  dynamic_linker='GNU ld.so'
  ;;
 freebsd* | dragonfly*)
  # DragonFly does not have aout.  When/if they implement a new
  # versioning mechanism, adjust this.
@ -18914,7 +18972,7 @@ linux*oldld* | linux*aout* | linux*coff*)
  ;;
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -18943,7 +19001,7 @@ linux* | k*bsd*-gnu)
  dynamic_linker='GNU/Linux ld.so'
  ;;
-netbsdelf*-gnu)
+knetbsd*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no
@ -18952,7 +19010,7 @@ netbsdelf*-gnu)
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
+  dynamic_linker='GNU ld.so'
  ;;
 netbsd*)
@ -20256,6 +20314,7 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
 fi
 { echo "$as_me:$LINENO: checking for error_at_line" >&5
 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6; }
 if test "${ac_cv_lib_error_at_line+set}" = set; then
@ -20964,9 +21023,7 @@ REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
-
+ if test -f release; then
 if test -f release; then
  RELEASE_PRESENT_TRUE=
  RELEASE_PRESENT_FALSE='#'
 else
@ -21711,9 +21768,7 @@ else
  enable_libtap=no
 fi
-
+ if test "$enable_libtap" = "yes"; then
 if test "$enable_libtap" = "yes"; then
  USE_LIBTAP_LOCAL_TRUE=
  USE_LIBTAP_LOCAL_FALSE='#'
 else
@ -21805,9 +21860,7 @@ else
  enable_extra_opts=no
 fi
-
+ if test "$enable_extra_opts" = "yes"; then
 if test "$enable_extra_opts" = "yes"; then
  USE_PARSE_INI_TRUE=
  USE_PARSE_INI_FALSE='#'
 else
@ -38857,9 +38910,7 @@ fi
-
+   if false; then
 if false; then
  GL_COND_LIBTOOL_TRUE=
  GL_COND_LIBTOOL_FALSE='#'
 else
@ -56120,7 +56171,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nagios-plugins $as_me 1.4.13, which was
+This file was extended by nagios-plugins $as_me 1.4.14, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -56173,7 +56224,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-nagios-plugins config.status 1.4.13
+nagios-plugins config.status 1.4.14
 configured by $0, generated by GNU Autoconf 2.61,
  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -56415,6 +56466,7 @@ target_alias!$target_alias$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
 am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@ -56471,7 +56523,6 @@ CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
 CXXDEPMODE!$CXXDEPMODE$ac_delim
 am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
 am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -56513,6 +56564,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
 CXXCPP!$CXXCPP$ac_delim
 F77!$F77$ac_delim
 FFLAGS!$FFLAGS$ac_delim
@ -56609,7 +56661,6 @@ GNULIB_INET_NTOP!$GNULIB_INET_NTOP$ac_delim
 GNULIB_INET_PTON!$GNULIB_INET_PTON$ac_delim
 HAVE_DECL_INET_NTOP!$HAVE_DECL_INET_NTOP$ac_delim
 HAVE_DECL_INET_PTON!$HAVE_DECL_INET_PTON$ac_delim
 ARPA_INET_H!$ARPA_INET_H$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -56651,6 +56702,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 ARPA_INET_H!$ARPA_INET_H$ac_delim
 HAVE_ARPA_INET_H!$HAVE_ARPA_INET_H$ac_delim
 INCLUDE_NEXT!$INCLUDE_NEXT$ac_delim
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE!$INCLUDE_NEXT_AS_FIRST_DIRECTIVE$ac_delim
@ -56747,7 +56799,6 @@ REPLACE_CEILF!$REPLACE_CEILF$ac_delim
 REPLACE_CEILL!$REPLACE_CEILL$ac_delim
 REPLACE_FLOORF!$REPLACE_FLOORF$ac_delim
 REPLACE_FLOORL!$REPLACE_FLOORL$ac_delim
 REPLACE_FREXP!$REPLACE_FREXP$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -56789,6 +56840,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 REPLACE_FREXP!$REPLACE_FREXP$ac_delim
 REPLACE_FREXPL!$REPLACE_FREXPL$ac_delim
 REPLACE_HUGE_VAL!$REPLACE_HUGE_VAL$ac_delim
 REPLACE_ISFINITE!$REPLACE_ISFINITE$ac_delim
@ -56885,7 +56937,6 @@ GETADDRINFO_LIB!$GETADDRINFO_LIB$ac_delim
 GNULIB_MALLOC_POSIX!$GNULIB_MALLOC_POSIX$ac_delim
 GNULIB_REALLOC_POSIX!$GNULIB_REALLOC_POSIX$ac_delim
 GNULIB_CALLOC_POSIX!$GNULIB_CALLOC_POSIX$ac_delim
 GNULIB_ATOLL!$GNULIB_ATOLL$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -56927,6 +56978,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 GNULIB_ATOLL!$GNULIB_ATOLL$ac_delim
 GNULIB_GETLOADAVG!$GNULIB_GETLOADAVG$ac_delim
 GNULIB_GETSUBOPT!$GNULIB_GETSUBOPT$ac_delim
 GNULIB_MKDTEMP!$GNULIB_MKDTEMP$ac_delim
@ -57023,7 +57075,6 @@ HAVE_DPRINTF!$HAVE_DPRINTF$ac_delim
 REPLACE_DPRINTF!$REPLACE_DPRINTF$ac_delim
 HAVE_VDPRINTF!$HAVE_VDPRINTF$ac_delim
 REPLACE_VDPRINTF!$REPLACE_VDPRINTF$ac_delim
 HAVE_VASPRINTF!$HAVE_VASPRINTF$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -57065,6 +57116,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 HAVE_VASPRINTF!$HAVE_VASPRINTF$ac_delim
 REPLACE_VASPRINTF!$REPLACE_VASPRINTF$ac_delim
 HAVE_DECL_OBSTACK_PRINTF!$HAVE_DECL_OBSTACK_PRINTF$ac_delim
 REPLACE_OBSTACK_PRINTF!$REPLACE_OBSTACK_PRINTF$ac_delim
@ -57161,7 +57213,6 @@ HAVE_DECL_STRSIGNAL!$HAVE_DECL_STRSIGNAL$ac_delim
 HAVE_STRVERSCMP!$HAVE_STRVERSCMP$ac_delim
 REPLACE_MEMMEM!$REPLACE_MEMMEM$ac_delim
 REPLACE_STRDUP!$REPLACE_STRDUP$ac_delim
 REPLACE_STRSTR!$REPLACE_STRSTR$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -57203,6 +57254,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 REPLACE_STRSTR!$REPLACE_STRSTR$ac_delim
 REPLACE_STRCASESTR!$REPLACE_STRCASESTR$ac_delim
 REPLACE_STRERROR!$REPLACE_STRERROR$ac_delim
 REPLACE_STRSIGNAL!$REPLACE_STRSIGNAL$ac_delim
@ -57233,7 +57285,7 @@ gltests_LIBOBJS!$gltests_LIBOBJS$ac_delim
 gltests_LTLIBOBJS!$gltests_LTLIBOBJS$ac_delim
 _ACEOF
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
    break
  elif $ac_last_try; then
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@ -57683,8 +57735,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
  # some people rename them; so instead we look at the file content.
  # Grep'ing the first line is not enough: some people post-process
  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
+  # Grep'ing the whole file is not good either: AIX grep has a line
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # limit of 2048, but all sed's we know have understand at least 4000.
  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
    dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
--- a/configure.in
+++ b/configure.in
@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.13)
+AC_INIT(nagios-plugins,1.4.14)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
--- a/contrib/check_adptraid.sh
+++ b/contrib/check_adptraid.sh
@ -13,7 +13,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 302 $' | sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
--- a/contrib/check_apc_ups.pl
+++ b/contrib/check_apc_ups.pl
@ -38,7 +38,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s"		=> \$opt_H);
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 2091 $');
+	print_revision($PROGNAME,'$Revision: 1771 $');
 	exit $ERRORS{'OK'};
 }
@ -252,7 +252,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $');
+	print_revision($PROGNAME,'$Revision: 1771 $');
 	print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop
 This plugin reports the status of an APC UPS equipped with an SNMP management
--- a/contrib/check_appletalk.pl
+++ b/contrib/check_appletalk.pl
@ -9,7 +9,7 @@
 # using "aecho"
 #
 # initial version: 23 October 2002 by Stefan Beck, IT Software Solutions
-# current status: $Revision: 2091 $
+# current status: $Revision: 1771 $
 #
 # Copyright Notice: GPL
 #
@ -122,7 +122,7 @@ while (<CMD>) {
 }
 sub print_help() {
-     print_revision( $PROGNAME, '$Revision: 2091 $ ' );
+     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
     print "Copyright (c) 2002 Stefan Beck\n";
     print "\n";
     print "Check if an atalkhost responds to an atalk echo using\n";
@ -159,7 +159,7 @@ sub print_usage () {
 }
 sub version () {
-     print_revision( $PROGNAME, '$Revision: 2091 $ ' );
+     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
     exit $ERRORS{'OK'};
 }
--- a/contrib/check_arping.pl
+++ b/contrib/check_arping.pl
@ -55,7 +55,7 @@ if ($status == 0)
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1112 $ ');
 	exit $ERRORS{'OK'};
 }
@ -115,6 +115,6 @@ sub print_help {
 	print "   -t (--timeout)    Timeout in seconds.\n";
 	print "   -V (--version)    Plugin version\n";
 	print "   -h (--help)       usage help \n\n";
-	print_revision($PROGNAME, '$Revision: 2091 $');
+	print_revision($PROGNAME, '$Revision: 1112 $');
 }
--- a/contrib/check_email_loop.pl
+++ b/contrib/check_email_loop.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: check_email_loop.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $
 #
 # (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-)
 # Copyleft by GNU GPL
--- a/contrib/check_fan_cpq_present
+++ b/contrib/check_fan_cpq_present
@ -111,7 +111,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -122,7 +122,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 2091 $ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_fan_fsc_present
+++ b/contrib/check_fan_fsc_present
@ -113,7 +113,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -124,7 +124,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 2091 $ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_frontpage
+++ b/contrib/check_frontpage
@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# $Id: check_frontpage 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_frontpage 1112 2005-01-27 04:46:08Z stanleyhopcroft $
 #
 # Check that FrontPage extensions appear to be working on a specified host.
 # Currently only checks that the hit counter is not returning an error.
@ -42,7 +42,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 2091 $'); #'
+	print_revision($PROGNAME,'$Revision: 1112 $'); #'
 	exit $ERRORS{'OK'};
 }
@ -139,7 +139,7 @@ sub print_usage () {
 }
 sub print_help () {
-   print_revision($PROGNAME,'$Revision: 2091 $');
+   print_revision($PROGNAME,'$Revision: 1112 $');
   print "Copyright (c) 2003 Kev Green\n";
   print "\n";
   print "FrontPage remains a copyright/trademark of Microsoft Corporation.\n";
--- a/contrib/check_http-with-client-certificate.c
+++ b/contrib/check_http-with-client-certificate.c
@ -37,7 +37,7 @@
 *****************************************************************************/
 const char *progname = "check_http";
-#define REVISION "$Revision: 2091 $"
+#define REVISION "$Revision: 1117 $"
 #define CVSREVISION "1.24"
 #define COPYRIGHT "2003"
 #define AUTHORS "Fabian Pehla"
--- a/contrib/check_hw.sh
+++ b/contrib/check_hw.sh
@ -16,7 +16,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 939 $' | sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
--- a/contrib/check_ica_master_browser.pl
+++ b/contrib/check_ica_master_browser.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# $Id: check_ica_master_browser.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_ica_master_browser.pl 1099 2005-01-25 09:09:33Z stanleyhopcroft $
 # Revision 1.1  2005/01/25 09:09:33  stanleyhopcroft
 # New plugin - checks that ICA master browser is what it should be (important for firewalled dialup)
@ -169,7 +169,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1099 $ ');
 	print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
 Perl Check Citrix Master Browser plugin for Nagios.
@ -217,7 +217,7 @@ The ICA Client requests the address of the ICA master browser from the Citrix se
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1099 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_ica_metaframe_pub_apps.pl
+++ b/contrib/check_ica_metaframe_pub_apps.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# $Id: check_ica_metaframe_pub_apps.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_ica_metaframe_pub_apps.pl 1098 2005-01-25 09:07:39Z stanleyhopcroft $
 # Revision 1.1  2005/01/25 09:07:39  stanleyhopcroft
 # Replacement (structured name mainly) for check_citrix: check of ICA browse service
@ -302,7 +302,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1098 $ ');
 	print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
 Perl Check Citrix plugin for Nagios.
@ -349,7 +349,7 @@ The plugin works by
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1098 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_ica_program_neigbourhood.pl
+++ b/contrib/check_ica_program_neigbourhood.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# $Id: check_ica_program_neigbourhood.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_ica_program_neigbourhood.pl 1097 2005-01-25 09:05:53Z stanleyhopcroft $
 # Revision 1.1  2005/01/25 09:05:53  stanleyhopcroft
 # New plugin to check Citrix Metaframe XP "Program Neighbourhood"
@ -289,7 +289,7 @@ sub print_help() {
 #          1        2         3         4         5         6         7         8
 #12345678901234567890123456789012345678901234567890123456789012345678901234567890
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1097 $ ');
 my $help = <<EOHELP ;
 Copyright (c) 2004 Karl DeBisschop/S Hopcroft
@ -344,7 +344,7 @@ sub usage {
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1097 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_inodes-freebsd.pl
+++ b/contrib/check_inodes-freebsd.pl
@ -41,7 +41,7 @@ GetOptions
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision: 2091 $ ');
+        print_revision($PROGNAME,'$Revision: 72 $ ');
        exit $ERRORS{'OK'};
 }
@ -114,7 +114,7 @@ sub print_usage () {
 }
 sub print_help () {
-        print_revision($PROGNAME,'$Revision: 2091 $');
+        print_revision($PROGNAME,'$Revision: 72 $');
        print "Copyright (c) 2002 Andrew Ryder\n";
        print "\n";
        print_usage();
--- a/contrib/check_javaproc.pl
+++ b/contrib/check_javaproc.pl
@ -170,7 +170,7 @@ Perl Check java processes plugin for Nagios
 }
 sub revision() {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 211 $ ');
 }
 sub version () {
--- a/contrib/check_joy.sh
+++ b/contrib/check_joy.sh
@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2 $' | sed -e 's/[^0-9.]//g'`
 STATUS=""
 . $PROGPATH/utils.sh
--- a/contrib/check_log2.pl
+++ b/contrib/check_log2.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: check_log2.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_log2.pl 1300 2005-12-16 18:41:45Z harpermann $
 #
 # Log file regular expression detector for Nagios.
 # Written by Aaron Bostick (abostick@mydoconline.com)
@ -77,7 +77,7 @@ sub print_help ();
    $neg_re_pattern = '';
    $pattern_count = 0;
    $pattern_line = '';
-    $plugin_revision = '$Revision: 2091 $ ';
+    $plugin_revision = '$Revision: 1300 $ ';
    # Grab options from command line
    GetOptions
--- a/contrib/check_lotus.pl
+++ b/contrib/check_lotus.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# $Id: check_lotus.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_lotus.pl 1096 2005-01-25 09:04:26Z stanleyhopcroft $
 # Revision 1.1  2005/01/25 09:04:26  stanleyhopcroft
 # New plugin to check responsiveness of Louts Notes (v5 at least) servers
@ -218,7 +218,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1096 $ ');
 	print "Copyright (c) 2004 Ed Rolison/S Hopcroft
 Perl Check Lotus Notes plugin for Nagios.
@ -249,7 +249,7 @@ Returns OK if the named server responds with its name.
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 1096 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_mem.pl
+++ b/contrib/check_mem.pl
@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: check_mem.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_mem.pl 2 2002-02-28 06:42:51Z egalstad $
 # check_mem.pl Copyright (C) 2000 Dan Larsson <dl@tyfon.net>
 #
--- a/contrib/check_ms_spooler.pl
+++ b/contrib/check_ms_spooler.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# $Id: check_ms_spooler.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_ms_spooler.pl 64 2002-07-16 00:04:42Z stanleyhopcroft $
 # Revision 1.1  2002/07/16 00:04:42  stanleyhopcroft
 # Primitive and in need of refinement test of MS spooler (with smbclient)
@ -267,7 +267,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 64 $ ');
 	print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
 Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler.
@ -291,7 +291,7 @@ Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 64 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_ora_table_space.pl
+++ b/contrib/check_ora_table_space.pl
@ -4,8 +4,8 @@
 # Written by: Erwan Arzur (erwan@netvalue.com)
 # License: GPL
 #
-# Last Modified: $Date: 2008-11-23 05:38:47 +0000 (Sun, 23 Nov 2008) $
+# Last Modified: $Date: 2002-02-28 01:42:51 -0500 (Thu, 28 Feb 2002) $
-# Revisiin: $Revision: 2091 $
+# Revisiin: $Revision: 2 $
 #
 # "check_ora_table_space.pl" plugin to check the state of Oracle 
 # table spaces. Scarce documentation.
--- a/contrib/check_oracle_instance.pl
+++ b/contrib/check_oracle_instance.pl
@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: check_oracle_instance.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_oracle_instance.pl 10 2002-04-03 02:58:47Z sghosh $
 #  Copyright (c) 2002  Sven Dolderer
 #  some pieces of Code adopted from Adam vonNieda's oracletool.pl
@ -23,7 +23,7 @@ require DBD::Oracle || die "It appears that the DBD::Oracle module is not instal
 use vars qw($VERSION $PROGNAME $logfile $debug $state $dbh $database $username $password $message $sql $cursor $opt_asession $opt_nsession $opt_tablespace $opt_nextents $opt_fextents $opt_aextents $privsok $warn $critical);
-'$Revision: 2091 $' =~ /^.*(\d+.\d+) \$$/;  # Use The Revision from RCS/CVS
+'$Revision: 10 $' =~ /^.*(\d+.\d+) \$$/;  # Use The Revision from RCS/CVS
 $VERSION = $1;
 $0 =~ m!^.*/([^/]+)$!;
 $PROGNAME = $1;
--- a/contrib/check_oracle_tbs
+++ b/contrib/check_oracle_tbs
@ -30,7 +30,7 @@ if (!$ENV{ORACLE_HOME}) {
 my $state = $ERRORS{'UNKNOWN'};
 my $answer = undef;
-my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 2091 $ =~ /(\d+)\.(\d+)/;
+my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1134 $ =~ /(\d+)\.(\d+)/;
 my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION);
 my $opt_debug;                  # -d|--debug
--- a/contrib/check_pfstate
+++ b/contrib/check_pfstate
@ -27,7 +27,7 @@ GetOptions
 	 "c=s" => \$opt_c, "critical=s"	=> \$opt_c);
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision: 2091 $');
+        print_revision($PROGNAME,'$Revision: 1112 $');
        exit $ERRORS{'OK'};
 }
 if ($opt_h) {
@ -67,7 +67,7 @@ exit $ERRORS{'OK'};
 sub print_help {
-        print_revision($PROGNAME,'$Revision: 2091 $');
+        print_revision($PROGNAME,'$Revision: 1112 $');
        print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n";
        print "Usage:\t-H, --hostname=<HOST> [-w, --warning=<WARNING>] [-c, --critical=<CRITICAL>]\n\n\tDefault warning is 50000 and critical is 60000.\n\n";
        support();
--- a/contrib/check_rbl.c
+++ b/contrib/check_rbl.c
@ -11,7 +11,7 @@
 * * License: GPL
 * * Copyright (c) 2000
 * * 
-* * $Id: check_rbl.c 2091 2008-11-23 05:38:47Z dermoth $
+* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
 *
 *****************************************************************************/
@ -22,7 +22,7 @@
 #include "string.h"
 const char progname = "check_rbl";
-const char *revision = "$Revision: 2091 $";
+const char *revision = "$Revision: 970 $";
 //const char *copyright = "2000-2003";
 //const char *email = "nagiosplug-devel@lists.sourceforge.net";
@ -263,7 +263,7 @@ int call_getopt(int argc, char **argv)
 				}
 				break;
      case 'V': /* version */
-				print_revision(progname,"$Revision: 2091 $");
+				print_revision(progname,"$Revision: 970 $");
 				exit(STATE_OK);
      case 'h': /* help */
 				print_help();
@ -291,7 +291,7 @@ int validate_arguments(void)
 void print_help(void)
 {
-	print_revision(progname,"$Revision: 2091 $");
+	print_revision(progname,"$Revision: 970 $");
 	printf
 		("Copyright (c) 2000 Karl DeBisschop\n\n"
 		 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");
--- a/contrib/check_smb.sh
+++ b/contrib/check_smb.sh
@ -26,7 +26,7 @@
 #
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 71 $' | sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
--- a/contrib/check_snmp_disk_monitor.pl
+++ b/contrib/check_snmp_disk_monitor.pl
@ -52,7 +52,7 @@ sub process_options {
 }
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision: 2091 $ ' )
+        print_revision( $PROGNAME, '$Revision: 82 $ ' )
 }
 sub print_usage {
--- a/contrib/check_snmp_printer.pl
+++ b/contrib/check_snmp_printer.pl
@ -116,7 +116,7 @@ GetOptions
 $PROGNAME = "check_snmp_printer";
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 2091 $');
+	print_revision($PROGNAME,'$Revision: 795 $');
 	exit $ERRORS{'OK'};
 }
@ -572,7 +572,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $');
+	print_revision($PROGNAME,'$Revision: 795 $');
 	print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad.
 This plugin reports the status of an network printer with an SNMP management
--- a/contrib/check_snmp_process_monitor.pl
+++ b/contrib/check_snmp_process_monitor.pl
@ -91,7 +91,7 @@ sub process_options {
 }
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision: 2091 $ ' )
+        print_revision( $PROGNAME, '$Revision: 84 $ ' )
 }
 sub print_usage {
--- a/contrib/check_snmp_procs.pl
+++ b/contrib/check_snmp_procs.pl
@ -109,7 +109,7 @@ if (GetOptions(
 }
 if ($opt_version) {
-	print_revision($PROGNAME, "\$Revision: 2091 $REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
 	exit $ERRORS{'OK'};
 }
@ -529,7 +529,7 @@ sub print_usage {
 #
 sub print_help {
-	print_revision($PROGNAME, "\$Revision: 2091 $REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
 	print "Copyright (c) 2003 David Alden
 Check if processes are running on a host via snmp
--- a/contrib/check_temp_cpq
+++ b/contrib/check_temp_cpq
@ -138,7 +138,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -151,7 +151,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 2091 $ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_temp_fsc
+++ b/contrib/check_temp_fsc
@ -138,7 +138,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $\n ');
+	print_revision($PROGNAME,'$Revision: 1113 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -149,7 +149,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 2091 $ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_traceroute.pl
+++ b/contrib/check_traceroute.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl
-# $Id: check_traceroute.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_traceroute.pl 1115 2005-01-27 10:34:16Z stanleyhopcroft $
 # Revision 1.1  2005/01/27 10:34:16  stanleyhopcroft
 # Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak
@ -31,7 +31,7 @@ getopts('i:H:N:R:T:dhrvV');
 do { print_help ; exit $ERRORS{OK}; }
 	if $opt_h ;
-do { print_revision($PROGNAME, '$Revision: 2091 $'); exit $ERRORS{OK}; }
+do { print_revision($PROGNAME, '$Revision: 1115 $'); exit $ERRORS{OK}; }
 	if $opt_V ;
 do { print_help; exit $ERRORS{OK}; }
@ -175,7 +175,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME, '$Revision: 2091 $') ;
+	print_revision($PROGNAME, '$Revision: 1115 $') ;
 	print "Copyright (c) 2004 J Meek/Karl DeBisschop
 This plugin checks whether traceroute to the destination succeeds and if so that the route string option (-R) matches the list of routers
--- a/contrib/check_uptime.c
+++ b/contrib/check_uptime.c
@ -9,7 +9,7 @@
 * Based on CHECK_LOAD.C
 * Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>
 *
- * Last Modified: $Date: 2008-11-23 05:38:47 +0000 (Sun, 23 Nov 2008) $
+ * Last Modified: $Date: 2002-02-28 21:42:56 -0500 (Thu, 28 Feb 2002) $
 *
 * Command line: CHECK_UPTIME <host_address>
 * 
@ -44,7 +44,7 @@ int main(int argc, char **argv)
  if(argc != 2){
    printf("Incorrect number of arguments supplied\n");
    printf("\n");
-    print_revision(argv[0],"$Revision: 2091 $");
+    print_revision(argv[0],"$Revision: 6 $");
    printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n");
    printf("\n");
    printf("Usage: %s <host_address>\n",argv[0]);
--- a/contrib/check_vcs.pl
+++ b/contrib/check_vcs.pl
@ -71,7 +71,7 @@ sub print_help ();
    $vcs_negate = '';
    $vcs_result = '';
    $vcs_expected_result = 'ONLINE';
-    $plugin_revision = '$Revision: 2091 $ ';
+    $plugin_revision = '$Revision: 33 $ ';
    # Grab options from command line
    GetOptions
--- a/contrib/check_wins.pl
+++ b/contrib/check_wins.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# $Id: check_wins.pl 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: check_wins.pl 940 2004-11-25 04:46:16Z stanleyhopcroft $
 # Revision 1.3  2004/11/25 04:46:16  stanleyhopcroft
 # Non functional tidy ups to check_wins
@ -189,7 +189,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 940 $ ');
 	print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
 Perl Check WINS plugin for NetSaint.
@ -236,7 +236,7 @@ The plugin works by
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 2091 $ ');
+	print_revision($PROGNAME,'$Revision: 940 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/packet_utils.pm
+++ b/contrib/packet_utils.pm
@ -1,6 +1,6 @@
 package packet_utils;
-# $Id: packet_utils.pm 2091 2008-11-23 05:38:47Z dermoth $
+# $Id: packet_utils.pm 1100 2005-01-25 09:12:47Z stanleyhopcroft $
 # Revision 1.1  2005/01/25 09:12:47  stanleyhopcroft
 # packet creation and dumping hacks used by check_ica* and check_lotus
--- a/contrib/utils.py
+++ b/contrib/utils.py
@ -8,7 +8,7 @@
 #==========================================================================
 #
-# Version: = '$Id: utils.py 2091 2008-11-23 05:38:47Z dermoth $'
+# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $'
 #
 # (C) Rob W.W. Hooft, Nonius BV, 1998
 #
--- a/gl/Makefile.in
+++ b/gl/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -27,13 +27,10 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -137,36 +134,37 @@ am_libgnu_a_OBJECTS = base64.$(OBJEXT) full-read.$(OBJEXT) \
 	xalloc-die.$(OBJEXT) xstrndup.$(OBJEXT)
 libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
 DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
+	install-dvi-recursive install-exec-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
+	install-html-recursive install-info-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
-	uninstall-recursive
+	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -221,8 +219,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -503,6 +499,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -533,6 +530,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -603,8 +601,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -701,11 +697,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -716,13 +708,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -734,6 +726,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -767,8 +760,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
 AUTOMAKE_OPTIONS = 1.5 gnits
 SUBDIRS = 
@ -968,22 +964,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@ -994,10 +990,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@ -1029,8 +1021,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
+$(RECURSIVE_CLEAN_TARGETS):
 maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@ -1131,23 +1122,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(top_srcdir)/build-aux $(distdir)/m4
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	  case $$file in \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -1161,7 +1150,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@ -1169,6 +1158,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@ -1218,7 +1209,7 @@ distclean: distclean-recursive
 	-rm -rf $(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 dvi: dvi-recursive
@ -1232,12 +1223,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-recursive
 install-exec-am: install-exec-local
 install-html: install-html-recursive
 install-info: install-info-recursive
 install-man:
 install-pdf: install-pdf-recursive
 install-ps: install-ps-recursive
 installcheck-am:
 maintainer-clean: maintainer-clean-recursive
@ -1258,25 +1257,26 @@ ps: ps-recursive
 ps-am:
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	check-am clean clean-generic clean-libtool \
+	all all-am all-local check check-am clean clean-generic \
-	clean-noinstLIBRARIES clean-noinstLTLIBRARIES clean-recursive \
+	clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
 	ctags ctags-recursive distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-recursive \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-am \
-	install install-am install-data install-data-am install-exec \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-exec-am install-exec-local install-info \
+	install-exec install-exec-am install-exec-local install-html \
-	install-info-am install-man install-strip installcheck \
+	install-html-am install-info install-info-am install-man \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	maintainer-clean-generic maintainer-clean-recursive \
+	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	tags-recursive uninstall uninstall-am uninstall-local
 	uninstall-info-am uninstall-local
 # We need the following in order to create <alloca.h> when the system
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,13 +14,10 @@
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -126,35 +123,36 @@ am__libnagiosplug_a_SOURCES_DIST = utils_base.c utils_disk.c \
 am_libnagiosplug_a_OBJECTS = utils_base.$(OBJEXT) utils_disk.$(OBJEXT) \
 	utils_tcp.$(OBJEXT) utils_cmd.$(OBJEXT) $(am__objects_1)
 libnagiosplug_a_OBJECTS = $(am_libnagiosplug_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libnagiosplug_a_SOURCES)
 DIST_SOURCES = $(am__libnagiosplug_a_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
+	install-dvi-recursive install-exec-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
+	install-html-recursive install-info-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
-	uninstall-recursive
+	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -209,8 +207,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -491,6 +487,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -521,6 +518,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -591,8 +589,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -689,11 +685,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -704,13 +696,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -722,6 +714,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -755,8 +748,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
 SUBDIRS = . tests
 noinst_LIBRARIES = libnagiosplug.a
@ -819,22 +815,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_tcp.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@ -845,10 +841,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@ -880,8 +872,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
+$(RECURSIVE_CLEAN_TARGETS):
 maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@ -982,22 +973,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -1011,7 +1001,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@ -1019,6 +1009,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@ -1061,7 +1053,7 @@ distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 dvi: dvi-recursive
@ -1075,12 +1067,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-recursive
 install-exec-am:
 install-html: install-html-recursive
 install-info: install-info-recursive
 install-man:
 install-pdf: install-pdf-recursive
 install-ps: install-ps-recursive
 installcheck-am:
 maintainer-clean: maintainer-clean-recursive
@ -1101,23 +1101,25 @@ ps: ps-recursive
 ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	clean clean-generic clean-libtool clean-noinstLIBRARIES \
+	all all-am check check-am clean clean-generic clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
+	clean-noinstLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	html-am info info-am install install-am install-data \
+	install install-am install-data install-data-am install-dvi \
-	install-data-am install-exec install-exec-am install-info \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-info-am install-man install-strip installcheck \
+	install-html-am install-info install-info-am install-man \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	maintainer-clean-generic maintainer-clean-recursive \
+	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	uninstall uninstall-am
 test test-debug:
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,13 +14,10 @@
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -35,8 +32,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = @EXTRA_TEST@
 check_PROGRAMS = @EXTRA_TEST@
 EXTRA_PROGRAMS = test_utils$(EXEEXT) test_disk$(EXEEXT) \
 	test_tcp$(EXEEXT) test_cmd$(EXEEXT) test_base64$(EXEEXT) \
 	test_ini1$(EXEEXT) test_ini3$(EXEEXT) test_opts1$(EXEEXT) \
@ -171,29 +166,27 @@ test_utils_OBJECTS = test_utils.$(OBJEXT)
 test_utils_LDADD = $(LDADD)
 test_utils_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
 	$(top_srcdir)/gl/libgnu.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 DIST_SOURCES = test_base64.c test_cmd.c test_disk.c test_ini1.c \
 	test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_tcp.c \
 	test_utils.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -248,8 +241,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -530,6 +521,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -560,6 +552,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -630,8 +623,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -728,11 +719,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -743,13 +730,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -761,6 +748,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -794,12 +782,17 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
 noinst_PROGRAMS = @EXTRA_TEST@
 # These two lines support "make check", but we use "make test"
 TESTS = @EXTRA_TEST@
 check_PROGRAMS = @EXTRA_TEST@
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t
 np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
@ -861,34 +854,34 @@ clean-noinstPROGRAMS:
 	done
 test_base64$(EXEEXT): $(test_base64_OBJECTS) $(test_base64_DEPENDENCIES) 
 	@rm -f test_base64$(EXEEXT)
-	$(LINK) $(test_base64_LDFLAGS) $(test_base64_OBJECTS) $(test_base64_LDADD) $(LIBS)
+	$(LINK) $(test_base64_OBJECTS) $(test_base64_LDADD) $(LIBS)
 test_cmd$(EXEEXT): $(test_cmd_OBJECTS) $(test_cmd_DEPENDENCIES) 
 	@rm -f test_cmd$(EXEEXT)
-	$(LINK) $(test_cmd_LDFLAGS) $(test_cmd_OBJECTS) $(test_cmd_LDADD) $(LIBS)
+	$(LINK) $(test_cmd_OBJECTS) $(test_cmd_LDADD) $(LIBS)
 test_disk$(EXEEXT): $(test_disk_OBJECTS) $(test_disk_DEPENDENCIES) 
 	@rm -f test_disk$(EXEEXT)
-	$(LINK) $(test_disk_LDFLAGS) $(test_disk_OBJECTS) $(test_disk_LDADD) $(LIBS)
+	$(LINK) $(test_disk_OBJECTS) $(test_disk_LDADD) $(LIBS)
 test_ini1$(EXEEXT): $(test_ini1_OBJECTS) $(test_ini1_DEPENDENCIES) 
 	@rm -f test_ini1$(EXEEXT)
-	$(LINK) $(test_ini1_LDFLAGS) $(test_ini1_OBJECTS) $(test_ini1_LDADD) $(LIBS)
+	$(LINK) $(test_ini1_OBJECTS) $(test_ini1_LDADD) $(LIBS)
 test_ini3$(EXEEXT): $(test_ini3_OBJECTS) $(test_ini3_DEPENDENCIES) 
 	@rm -f test_ini3$(EXEEXT)
-	$(LINK) $(test_ini3_LDFLAGS) $(test_ini3_OBJECTS) $(test_ini3_LDADD) $(LIBS)
+	$(LINK) $(test_ini3_OBJECTS) $(test_ini3_LDADD) $(LIBS)
 test_opts1$(EXEEXT): $(test_opts1_OBJECTS) $(test_opts1_DEPENDENCIES) 
 	@rm -f test_opts1$(EXEEXT)
-	$(LINK) $(test_opts1_LDFLAGS) $(test_opts1_OBJECTS) $(test_opts1_LDADD) $(LIBS)
+	$(LINK) $(test_opts1_OBJECTS) $(test_opts1_LDADD) $(LIBS)
 test_opts2$(EXEEXT): $(test_opts2_OBJECTS) $(test_opts2_DEPENDENCIES) 
 	@rm -f test_opts2$(EXEEXT)
-	$(LINK) $(test_opts2_LDFLAGS) $(test_opts2_OBJECTS) $(test_opts2_LDADD) $(LIBS)
+	$(LINK) $(test_opts2_OBJECTS) $(test_opts2_LDADD) $(LIBS)
 test_opts3$(EXEEXT): $(test_opts3_OBJECTS) $(test_opts3_DEPENDENCIES) 
 	@rm -f test_opts3$(EXEEXT)
-	$(LINK) $(test_opts3_LDFLAGS) $(test_opts3_OBJECTS) $(test_opts3_LDADD) $(LIBS)
+	$(LINK) $(test_opts3_OBJECTS) $(test_opts3_LDADD) $(LIBS)
 test_tcp$(EXEEXT): $(test_tcp_OBJECTS) $(test_tcp_DEPENDENCIES) 
 	@rm -f test_tcp$(EXEEXT)
-	$(LINK) $(test_tcp_LDFLAGS) $(test_tcp_OBJECTS) $(test_tcp_LDADD) $(LIBS)
+	$(LINK) $(test_tcp_OBJECTS) $(test_tcp_LDADD) $(LIBS)
 test_utils$(EXEEXT): $(test_utils_OBJECTS) $(test_utils_DEPENDENCIES) 
 	@rm -f test_utils$(EXEEXT)
-	$(LINK) $(test_utils_LDFLAGS) $(test_utils_OBJECTS) $(test_utils_LDADD) $(LIBS)
+	$(LINK) $(test_utils_OBJECTS) $(test_utils_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -908,22 +901,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utils.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@ -934,10 +927,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@ -987,9 +976,9 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@ -998,7 +987,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@ -1010,7 +999,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@ -1060,22 +1049,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -1125,7 +1113,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 dvi: dvi-am
@ -1139,12 +1127,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-exec-am:
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -1165,19 +1161,23 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool \
 	clean-noinstPROGRAMS ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-info install-info-am install-man install-strip \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 test: ${noinst_PROGRAMS}
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: trunk-200906171200
+Version: 1.4.14
-Release: snapshot
+Release: 1
 Summary: Host/service/network monitoring program plugins for Nagios
 Group: Applications/System
--- a/perlmods/Makefile
+++ b/perlmods/Makefile
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # perlmods/Makefile.  Generated from Makefile.in by configure.
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -13,13 +13,10 @@
 # PARTICULAR PURPOSE.
 srcdir = .
 top_srcdir = ..
 pkgdatadir = $(datadir)/nagios-plugins
 pkglibdir = $(libdir)/nagios-plugins
 pkgincludedir = $(includedir)/nagios-plugins
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -32,8 +29,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
+build_triplet = i386-apple-darwin9.8.0
-host_triplet = i686-pc-linux-gnu
+host_triplet = i386-apple-darwin9.8.0
 subdir = perlmods
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -116,20 +113,17 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-INSTALL = /usr/bin/install -c 
+ACLOCAL = ${SHELL} /Users/tonvoon/git/nagiosplugins/build-aux/missing --run aclocal-1.10
 ACLOCAL = ${SHELL} /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/missing --run aclocal-1.9
 ALLOCA = 
 ALLOCA_H = alloca.h
-AMDEP_FALSE = #
+AMTAR = ${SHELL} /Users/tonvoon/git/nagiosplugins/build-aux/missing --run tar
 AMDEP_TRUE = 
 AMTAR = ${SHELL} /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/missing --run tar
 APPLE_UNIVERSAL_BUILD = 0
 AR = ar
 ARPA_INET_H = arpa/inet.h
-AUTOCONF = ${SHELL} /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/missing --run autoconf
+AUTOCONF = ${SHELL} /Users/tonvoon/git/nagiosplugins/build-aux/missing --run autoconf
-AUTOHEADER = ${SHELL} /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/missing --run autoheader
+AUTOHEADER = ${SHELL} /Users/tonvoon/git/nagiosplugins/build-aux/missing --run autoheader
-AUTOMAKE = ${SHELL} /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/missing --run automake-1.9
+AUTOMAKE = ${SHELL} /Users/tonvoon/git/nagiosplugins/build-aux/missing --run automake-1.10
-AWK = mawk
+AWK = awk
 BASENAME = /usr/bin/basename
 BITSIZEOF_PTRDIFF_T = 32
 BITSIZEOF_SIG_ATOMIC_T = 32
@ -149,11 +143,11 @@ CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 DEPLIBS = 
-ECHO = echo
+ECHO = /bin/echo
-ECHO_C = 
+ECHO_C = \c
-ECHO_N = -n
+ECHO_N = 
 ECHO_T = 
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
 EMULTIHOP_HIDDEN = 
 EMULTIHOP_VALUE = 
 ENOLINK_HIDDEN = 
@ -162,7 +156,7 @@ EOVERFLOW_HIDDEN =
 EOVERFLOW_VALUE = 
 ERRNO_H = 
 EXEEXT = 
-EXTRAS =  check_ldap check_ide_smart check_procs check_nagios check_dns check_by_ssh check_swap check_dig check_apt check_nt
+EXTRAS =  check_ldap check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
 EXTRAS_ROOT = 
 EXTRA_NETOBJS = 
 EXTRA_TEST = 
@ -170,16 +164,14 @@ F77 =
 FCNTL_H = fcntl.h
 FFLAGS = 
 FLOAT_H = 
-FLOORF_LIBM = -lm
+FLOORF_LIBM = 
 GETADDRINFO_LIB = 
 GETLOADAVG_LIBS = 
-GETOPT_H = 
+GETOPT_H = getopt.h
 GETTEXT_MACRO_VERSION = 0.17
-GLIBC21 = yes
+GLIBC21 = no
-GL_COND_LIBTOOL_FALSE = 
+GMSGFMT = /opt/local/bin/msgfmt
-GL_COND_LIBTOOL_TRUE = #
+GMSGFMT_015 = /opt/local/bin/msgfmt
 GMSGFMT = /usr/bin/msgfmt
 GMSGFMT_015 = /usr/bin/msgfmt
 GNULIB_ACCEPT = 0
 GNULIB_ATOLL = 0
 GNULIB_BIND = 0
@ -335,7 +327,7 @@ GNULIB_WCSRTOMBS = 0
 GNULIB_WCTOB = 0
 GNULIB_WCWIDTH = 0
 GNULIB_WRITE = 1
-GREP = /bin/grep
+GREP = /usr/bin/grep
 HAVE_ARPA_INET_H = 1
 HAVE_ATOLL = 1
 HAVE_BTOWC = 1
@ -367,8 +359,8 @@ HAVE_DECL_SNPRINTF = 1
 HAVE_DECL_SQRTL = 1
 HAVE_DECL_STRDUP = 1
 HAVE_DECL_STRERROR = 1
-HAVE_DECL_STRNDUP = 1
+HAVE_DECL_STRNDUP = 0
-HAVE_DECL_STRNLEN = 1
+HAVE_DECL_STRNLEN = 0
 HAVE_DECL_STRSIGNAL = 1
 HAVE_DECL_STRTOK_R = 1
 HAVE_DECL_TANL = 1
@ -417,24 +409,24 @@ HAVE_RPMATCH = 1
 HAVE_SETENV = 1
 HAVE_SIGNED_SIG_ATOMIC_T = 1
 HAVE_SIGNED_WCHAR_T = 1
-HAVE_SIGNED_WINT_T = 0
+HAVE_SIGNED_WINT_T = 1
 HAVE_SLEEP = 1
 HAVE_STDINT_H = 1
 HAVE_STPCPY = 1
 HAVE_STPNCPY = 1
 HAVE_STRCASESTR = 1
 HAVE_STRCHRNUL = 1
-HAVE_STRNDUP = 1
+HAVE_STRNDUP = 0
 HAVE_STRPBRK = 1
 HAVE_STRSEP = 1
 HAVE_STRTOD = 1
 HAVE_STRTOLL = 1
 HAVE_STRTOULL = 1
 HAVE_STRUCT_ADDRINFO = 1
-HAVE_STRUCT_RANDOM_DATA = 1
+HAVE_STRUCT_RANDOM_DATA = 0
 HAVE_STRUCT_SOCKADDR_STORAGE = 1
 HAVE_STRVERSCMP = 1
-HAVE_SYS_BITYPES_H = 1
+HAVE_SYS_BITYPES_H = 0
 HAVE_SYS_INTTYPES_H = 0
 HAVE_SYS_LOADAVG_H = 0
 HAVE_SYS_PARAM_H = 0
@ -458,12 +450,13 @@ HOSTENT_LIB =
 HOSTNAME = /bin/hostname
 INCLUDE_NEXT = include_next
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
 INSTALL = /usr/bin/install -c 
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s 
 INTLLIBS = 
-INTL_MACOSX_LIBS = 
+INTL_MACOSX_LIBS = -Wl,-framework -Wl,CoreFoundation
 KMEM_GROUP = 
 KRBINCLUDE = 
 LDAPINCLUDE = -I/usr/include/ldap
@ -474,28 +467,29 @@ LIBGNU_LIBDEPS =
 LIBGNU_LTLIBDEPS = 
 LIBICONV = -liconv
 LIBINTL = 
-LIBOBJS = 
+LIBOBJS =  ${LIBOBJDIR}error$U.o
 LIBS = -lpthread -ldl 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LOCALCHARSET_TESTS_ENVIRONMENT = CHARSETALIASDIR="$(top_builddir)/gl"
-LOCALE_FR = none
+LOCALE_FR = fr_FR.ISO8859-1
-LOCALE_FR_UTF8 = none
+LOCALE_FR_UTF8 = fr_FR.UTF-8
-LOCALE_JA = none
+LOCALE_JA = ja_JP.eucJP
-LOCALE_ZH_CN = none
+LOCALE_ZH_CN = zh_CN.GB18030
 LTLIBICONV = -liconv
 LTLIBINTL = 
-LTLIBOBJS = 
+LTLIBOBJS =  ${LIBOBJDIR}error$U.lo
-MAKEINFO = ${SHELL} /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/missing --run makeinfo
+MAKEINFO = ${SHELL} /Users/tonvoon/git/nagiosplugins/build-aux/missing --run makeinfo
 MATHLIBS = -lm
-MSGFMT = /usr/bin/msgfmt
+MKDIR_P = ../build-aux/install-sh -c -d
-MSGFMT_015 = /usr/bin/msgfmt
+MSGFMT = /opt/local/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
+MSGFMT_015 = /opt/local/bin/msgfmt
-MYSQLCFLAGS = 
+MSGMERGE = /opt/local/bin/msgmerge
-MYSQLINCLUDE = 
+MYSQLCFLAGS = -I/usr/local/mysql/include  -Os -arch i386 -fno-common   -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT  -DDONT_DECLARE_CXA_PURE_VIRTUAL
-MYSQLLIBS = 
+MYSQLINCLUDE = -I/usr/local/mysql/include
 MYSQLLIBS = -L/usr/local/mysql/lib -lmysqlclient -lz -lm
 NEED_SETGID = false
-NETDB_H = 
+NETDB_H = netdb.h
 NETINET_IN_H = 
 NEXT_ARPA_INET_H = <arpa/inet.h>
 NEXT_ERRNO_H = 
@ -517,27 +511,27 @@ OBJEXT = o
 PACKAGE = nagios-plugins
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = nagios-plugins
-PACKAGE_STRING = nagios-plugins 1.4.13
+PACKAGE_STRING = nagios-plugins 1.4.14
 PACKAGE_TARNAME = nagios-plugins
-PACKAGE_VERSION = 1.4.13
+PACKAGE_VERSION = 1.4.14
 PATH_SEPARATOR = :
-PATH_TO_APTGET = /usr/bin/apt-get
+PATH_TO_APTGET = 
 PATH_TO_DIG = /usr/bin/dig
 PATH_TO_FPING = 
 PATH_TO_LMSTAT = 
 PATH_TO_LSPS = 
 PATH_TO_MAILQ = /usr/bin/mailq
 PATH_TO_NSLOOKUP = /usr/bin/nslookup
-PATH_TO_PING = /bin/ping
+PATH_TO_PING = /sbin/ping
-PATH_TO_PING6 = /bin/ping6
+PATH_TO_PING6 = /sbin/ping6
 PATH_TO_PS = /bin/ps
 PATH_TO_QMAIL_QSTAT = 
 PATH_TO_QSTAT = 
 PATH_TO_QUAKESTAT = 
-PATH_TO_RPCINFO = /usr/bin/rpcinfo
+PATH_TO_RPCINFO = /usr/sbin/rpcinfo
-PATH_TO_SMBCLIENT = 
+PATH_TO_SMBCLIENT = /usr/bin/smbclient
-PATH_TO_SNMPGET = 
+PATH_TO_SNMPGET = /usr/bin/snmpget
-PATH_TO_SNMPGETNEXT = 
+PATH_TO_SNMPGETNEXT = /usr/bin/snmpgetnext
 PATH_TO_SSH = /usr/bin/ssh
 PATH_TO_SWAP = 
 PATH_TO_SWAPINFO = 
@ -547,9 +541,9 @@ PERL = /usr/bin/perl
 PERLMODS_DIR = 
 PGINCLUDE = 
 PGLIBS = 
-PKG_ARCH = unknown
+PKG_ARCH = i386
 PLUGIN_TEST = t/check_by_ssh.t t/check_cluster.t t/check_dig.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t
-POSUB = po
+POSUB = 
 POW_LIB = 
 PRAGMA_SYSTEM_HEADER = #pragma GCC system_header
 PST3CFLAGS = 
@ -558,8 +552,6 @@ PYTHON = /usr/bin/python
 RADIUSLIBS = 
 RANLIB = ranlib
 RELEASE = 1
 RELEASE_PRESENT_FALSE = 
 RELEASE_PRESENT_TRUE = #
 REPLACE_BTOWC = 0
 REPLACE_CEILF = 0
 REPLACE_CEILL = 0
@ -622,7 +614,7 @@ REPLACE_STRPTIME = GNULIB_PORTCHECK
 REPLACE_STRSIGNAL = 0
 REPLACE_STRSTR = 0
 REPLACE_STRTOD = 0
-REPLACE_TIMEGM = 1
+REPLACE_TIMEGM = 0
 REPLACE_TRUNCL = 0
 REPLACE_VASPRINTF = 0
 REPLACE_VDPRINTF = 0
@ -636,16 +628,16 @@ REPLACE_WCSRTOMBS = 0
 REPLACE_WCTOB = 0
 REPLACE_WCWIDTH = 0
 REPLACE_WRITE = 0
-REV_DATESTAMP = 2009.06.17.13.02
+REV_DATESTAMP = 2009.09.16.09.38
-REV_TIMESTAMP = 20090617130212
+REV_TIMESTAMP = 20090916093814
 SCRIPT_TEST = t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
 SERVENT_LIB = 
 SET_MAKE = 
 SH = /bin/sh
 SHELL = /bin/sh
 SIG_ATOMIC_T_SUFFIX = 
-SIZE_T_SUFFIX = u
+SIZE_T_SUFFIX = ul
-SOCKETLIBS =  -lnsl -lresolv
+SOCKETLIBS =  -lresolv
 SSLINCLUDE = -I/usr/include
 SSLLIBS = -lssl -lcrypto
 STDBOOL_H = 
@ -656,65 +648,62 @@ SYS_SOCKET_H =
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = 0
 TIME_H_DEFINES_STRUCT_TIMESPEC = 1
 UNISTD_H_HAVE_WINSOCK2_H = 0
-USE_LIBTAP_LOCAL_FALSE = 
+USE_NLS = no
-USE_LIBTAP_LOCAL_TRUE = #
+VERSION = 1.4.14
 USE_NLS = yes
 USE_PARSE_INI_FALSE = 
 USE_PARSE_INI_TRUE = #
 VERSION = 1.4.13
 VOID_UNSETENV = 0
 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
 WCHAR_H = 
 WCHAR_T_SUFFIX = 
 WCTYPE_H = 
-WINT_T_SUFFIX = u
+WINT_T_SUFFIX = 
-XGETTEXT = /usr/bin/xgettext
+XGETTEXT = /opt/local/bin/xgettext
-XGETTEXT_015 = /usr/bin/xgettext
+XGETTEXT_015 = /opt/local/bin/xgettext
 XGETTEXT_EXTRA_OPTIONS =  --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format
 abs_builddir = /Users/tonvoon/git/nagiosplugins/perlmods
 abs_srcdir = /Users/tonvoon/git/nagiosplugins/perlmods
 abs_top_builddir = /Users/tonvoon/git/nagiosplugins
 abs_top_srcdir = /Users/tonvoon/git/nagiosplugins
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_F77 = 
 am__fastdepCC_FALSE = #
 am__fastdepCC_TRUE = 
 am__fastdepCXX_FALSE = #
 am__fastdepCXX_TRUE = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
+build = i386-apple-darwin9.8.0
 build_alias = 
-build_cpu = i686
+build_cpu = i386
-build_os = linux-gnu
+build_os = darwin9.8.0
-build_vendor = pc
+build_vendor = apple
 builddir = .
 check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-gl_LIBOBJS =  asnprintf.o basename.o c-strtod.o cloexec.o creat-safer.o dirname.o dup-safer.o exitfail.o fd-safer.o fsusage.o mktime.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o stripslash.o timegm.o vasnprintf.o xmalloc.o
+gl_LIBOBJS =  asnprintf.o basename.o c-strtod.o cloexec.o creat-safer.o dirname.o dup-safer.o error.o exitfail.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o stripslash.o strndup.o strnlen.o vasnprintf.o xmalloc.o
-gl_LTLIBOBJS =  asnprintf.lo basename.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dup-safer.lo exitfail.lo fd-safer.lo fsusage.lo mktime.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo stripslash.lo timegm.lo vasnprintf.lo xmalloc.lo
+gl_LTLIBOBJS =  asnprintf.lo basename.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dup-safer.lo error.lo exitfail.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo stripslash.lo strndup.lo strnlen.lo vasnprintf.lo xmalloc.lo
 gltests_LIBOBJS = 
 gltests_LTLIBOBJS = 
-host = i686-pc-linux-gnu
+host = i386-apple-darwin9.8.0
 host_alias = 
-host_cpu = i686
+host_cpu = i386
-host_os = linux-gnu
+host_os = darwin9.8.0
-host_vendor = pc
+host_vendor = apple
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /tmp/tonvoon/tmp_snapshot/trunk/nagiosplug/build-aux/install-sh
+install_sh = $(SHELL) /Users/tonvoon/git/nagiosplugins/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
-np_mysql_config = 
+np_mysql_config = /usr/local/mysql/bin/mysql_config
 oldincludedir = /usr/include
 pdfdir = ${docdir}
 prefix = /usr/local/nagios
@ -722,8 +711,11 @@ program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
 target_alias = 
 top_builddir = ..
 top_srcdir = ..
 with_trusted_path = /bin:/sbin:/usr/bin:/usr/sbin
 perlmoduledir = $(exec_prefix)/perl
 all: all-am
@ -764,10 +756,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 tags: TAGS
 TAGS:
@ -776,22 +764,21 @@ CTAGS:
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -836,7 +823,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 dvi: dvi-am
@ -850,12 +837,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-exec-am: install-exec-local
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -874,18 +869,21 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
 .MAKE: install-am install-strip
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool clean-local distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
+	install install-am install-data install-data-am install-dvi \
-	install-exec-am install-exec-local install-info \
+	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-info-am install-man install-strip installcheck \
+	install-html install-html-am install-info install-info-am \
-	installcheck-am installdirs maintainer-clean \
+	install-man install-pdf install-pdf-am install-ps \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	install-ps-am install-strip installcheck installcheck-am \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	installdirs maintainer-clean maintainer-clean-generic \
-	uninstall-info-am
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am
 all-local:
--- a/perlmods/Makefile.in
+++ b/perlmods/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -13,13 +13,10 @@
 # PARTICULAR PURPOSE.
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -116,12 +113,9 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -176,8 +170,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -458,6 +450,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -488,6 +481,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -558,8 +552,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -656,11 +648,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -671,13 +659,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -689,6 +677,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -722,8 +711,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
 perlmoduledir = $(exec_prefix)/perl
 all: all-am
@ -764,10 +756,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 tags: TAGS
 TAGS:
@ -776,22 +764,21 @@ CTAGS:
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -836,7 +823,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 dvi: dvi-am
@ -850,12 +837,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-exec-am: install-exec-local
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -874,18 +869,21 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
 .MAKE: install-am install-strip
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool clean-local distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
+	install install-am install-data install-data-am install-dvi \
-	install-exec-am install-exec-local install-info \
+	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-info-am install-man install-strip installcheck \
+	install-html install-html-am install-info install-info-am \
-	installcheck-am installdirs maintainer-clean \
+	install-man install-pdf install-pdf-am install-ps \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	install-ps-am install-strip installcheck installcheck-am \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	installdirs maintainer-clean maintainer-clean-generic \
-	uninstall-info-am
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am
 all-local:
--- a/pkg/solaris/pkginfo
+++ b/pkg/solaris/pkginfo
@ -1,12 +1,12 @@
 PKG="NAGplugin"
 NAME="nagios-plugins"
 DESC="Nagios network monitoring plugins"
-ARCH="unknown"
+ARCH="i386"
-VERSION="1.4.13,REV=2009.06.17.13.02"
+VERSION="1.4.14,REV=2009.09.16.09.38"
 CATEGORY="application"
 VENDOR="Nagios Plugin Development Team"
 EMAIL="nagiosplug-devel@lists.sourceforge.net"
-PSTAMP="nag20090617130212"
+PSTAMP="nag20090916093814"
 BASEDIR="/"
 CLASSES="none"
--- a/plugins-root/Makefile.in
+++ b/plugins-root/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,12 +14,9 @@
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -119,40 +116,39 @@ CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 check_dhcp_SOURCES = check_dhcp.c
 check_dhcp_OBJECTS = check_dhcp.$(OBJEXT)
-am__DEPENDENCIES_1 = ../plugins/utils.o ../lib/libnagiosplug.a \
+am__DEPENDENCIES_1 =
-	../gl/libgnu.a
+am__DEPENDENCIES_2 = ../plugins/netutils.o $(BASEOBJS) \
-am__DEPENDENCIES_2 =
+	$(am__DEPENDENCIES_1)
-am__DEPENDENCIES_3 = ../plugins/netutils.o $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 	$(am__DEPENDENCIES_2)
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2)
 check_icmp_SOURCES = check_icmp.c
 check_icmp_OBJECTS = check_icmp.$(OBJEXT)
 pst3_SOURCES = pst3.c
 pst3_OBJECTS = pst3-pst3.$(OBJEXT)
 pst3_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+pst3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(pst3_CFLAGS) $(CFLAGS) $(pst3_LDFLAGS) \
 	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = check_dhcp.c check_icmp.c pst3.c
 DIST_SOURCES = check_dhcp.c check_icmp.c pst3.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -207,8 +203,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -489,6 +483,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -519,6 +514,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -589,8 +585,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -687,11 +681,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -702,13 +692,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -720,6 +710,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -753,8 +744,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
@RELEASE_PRESENT_TRUE@NP_VERSION = $(PACKAGE_VERSION)
 AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
@ -833,13 +827,13 @@ clean-noinstPROGRAMS:
 	done
 check_dhcp$(EXEEXT): $(check_dhcp_OBJECTS) $(check_dhcp_DEPENDENCIES) 
 	@rm -f check_dhcp$(EXEEXT)
-	$(LINK) $(check_dhcp_LDFLAGS) $(check_dhcp_OBJECTS) $(check_dhcp_LDADD) $(LIBS)
+	$(LINK) $(check_dhcp_OBJECTS) $(check_dhcp_LDADD) $(LIBS)
 check_icmp$(EXEEXT): $(check_icmp_OBJECTS) $(check_icmp_DEPENDENCIES) 
 	@rm -f check_icmp$(EXEEXT)
-	$(LINK) $(check_icmp_LDFLAGS) $(check_icmp_OBJECTS) $(check_icmp_LDADD) $(LIBS)
+	$(LINK) $(check_icmp_OBJECTS) $(check_icmp_LDADD) $(LIBS)
 pst3$(EXEEXT): $(pst3_OBJECTS) $(pst3_DEPENDENCIES) 
 	@rm -f pst3$(EXEEXT)
-	$(LINK) $(pst3_LDFLAGS) $(pst3_OBJECTS) $(pst3_LDADD) $(LIBS)
+	$(pst3_LINK) $(pst3_OBJECTS) $(pst3_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -852,36 +846,36 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pst3-pst3.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 pst3-pst3.o: pst3.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.o -MD -MP -MF "$(DEPDIR)/pst3-pst3.Tpo" -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.o -MD -MP -MF $(DEPDIR)/pst3-pst3.Tpo -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pst3-pst3.Tpo" "$(DEPDIR)/pst3-pst3.Po"; else rm -f "$(DEPDIR)/pst3-pst3.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pst3-pst3.Tpo $(DEPDIR)/pst3-pst3.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pst3.c' object='pst3-pst3.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c
 pst3-pst3.obj: pst3.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.obj -MD -MP -MF "$(DEPDIR)/pst3-pst3.Tpo" -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi`; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.obj -MD -MP -MF $(DEPDIR)/pst3-pst3.Tpo -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pst3-pst3.Tpo" "$(DEPDIR)/pst3-pst3.Po"; else rm -f "$(DEPDIR)/pst3-pst3.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pst3-pst3.Tpo $(DEPDIR)/pst3-pst3.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pst3.c' object='pst3-pst3.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi`
@ -892,10 +886,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@ -945,9 +935,9 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@ -956,7 +946,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@ -968,7 +958,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@ -1018,22 +1008,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -1082,7 +1071,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 dvi: dvi-am
@ -1096,12 +1085,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-exec-am: install-exec-local
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -1122,20 +1119,23 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am \
+	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-local install-info install-info-am install-man \
+	install-exec-am install-exec-local install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 	uninstall-info-am
@RELEASE_PRESENT_FALSE@NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
@RELEASE_PRESENT_FALSE@	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@ -43,6 +43,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@ -232,6 +234,8 @@ try_again:
    printf("\n");
  }
  (void) closedir(procdir);
  return (0);
 }
--- a/plugins-scripts/Makefile.in
+++ b/plugins-scripts/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,12 +14,9 @@
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -121,12 +118,9 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 VPATH = $(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -181,8 +175,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -463,6 +455,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -493,6 +486,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -563,8 +557,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -661,11 +653,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -676,13 +664,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -694,6 +682,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -727,8 +716,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
@RELEASE_PRESENT_TRUE@NP_VERSION = $(PACKAGE_VERSION)
 SUFFIXES = .pl .sh
@ -786,7 +778,7 @@ utils.sh: $(top_builddir)/config.status $(srcdir)/utils.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libexecSCRIPTS: $(libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@ -809,10 +801,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 tags: TAGS
 TAGS:
@ -821,9 +809,9 @@ CTAGS:
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@ -832,7 +820,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@ -844,7 +832,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@ -894,22 +882,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -926,7 +913,7 @@ check: check-am
 all-am: Makefile $(SCRIPTS)
 installdirs:
 	for dir in "$(DESTDIR)$(libexecdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@ -959,7 +946,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 dvi: dvi-am
@ -973,12 +960,20 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-exec-am: install-libexecSCRIPTS
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -997,18 +992,22 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-info-am uninstall-libexecSCRIPTS
+uninstall-am: uninstall-libexecSCRIPTS
 .MAKE: install-am install-strip
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	clean-libtool clean-local distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
+	install install-am install-data install-data-am install-dvi \
-	install-exec-am install-info install-info-am \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-libexecSCRIPTS install-man install-strip installcheck \
+	install-html-am install-info install-info-am \
 	install-libexecSCRIPTS install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-libexecSCRIPTS
+	uninstall-libexecSCRIPTS
@RELEASE_PRESENT_FALSE@NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
@RELEASE_PRESENT_FALSE@	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -14,12 +14,9 @@
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -134,13 +131,11 @@ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 check_apt_SOURCES = check_apt.c
 check_apt_OBJECTS = check_apt.$(OBJEXT)
 am__DEPENDENCIES_1 = utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
 check_by_ssh_SOURCES = check_by_ssh.c
 check_by_ssh_OBJECTS = check_by_ssh.$(OBJEXT)
-am__DEPENDENCIES_2 =
+am__DEPENDENCIES_1 =
-am__DEPENDENCIES_3 = netutils.o $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_2 = netutils.o $(BASEOBJS) $(am__DEPENDENCIES_1)
-	$(am__DEPENDENCIES_2)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2)
 check_cluster_SOURCES = check_cluster.c
 check_cluster_OBJECTS = check_cluster.$(OBJEXT)
 check_dig_SOURCES = check_dig.c
@ -159,7 +154,6 @@ check_hpjd_SOURCES = check_hpjd.c
 check_hpjd_OBJECTS = check_hpjd.$(OBJEXT)
 check_http_SOURCES = check_http.c
 check_http_OBJECTS = check_http.$(OBJEXT)
 am__DEPENDENCIES_5 = sslutils.o
 check_ide_smart_SOURCES = check_ide_smart.c
 check_ide_smart_OBJECTS = check_ide_smart.$(OBJEXT)
 check_ldap_SOURCES = check_ldap.c
@ -172,9 +166,16 @@ check_mrtgtraf_SOURCES = check_mrtgtraf.c
 check_mrtgtraf_OBJECTS = check_mrtgtraf.$(OBJEXT)
 check_mysql_SOURCES = check_mysql.c
 check_mysql_OBJECTS = check_mysql-check_mysql.$(OBJEXT)
 check_mysql_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_mysql_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 check_mysql_query_SOURCES = check_mysql_query.c
 check_mysql_query_OBJECTS =  \
 	check_mysql_query-check_mysql_query.$(OBJEXT)
 check_mysql_query_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(check_mysql_query_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 check_nagios_SOURCES = check_nagios.c
 check_nagios_OBJECTS = check_nagios.$(OBJEXT)
 check_nt_SOURCES = check_nt.c
@ -219,17 +220,18 @@ negate_SOURCES = negate.c
 negate_OBJECTS = negate.$(OBJEXT)
 urlize_SOURCES = urlize.c
 urlize_OBJECTS = urlize.$(OBJEXT)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = check_apt.c check_by_ssh.c check_cluster.c check_dig.c \
 	check_disk.c check_dns.c check_dummy.c check_fping.c \
 	check_game.c check_hpjd.c check_http.c check_ide_smart.c \
@ -254,12 +256,9 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -315,8 +314,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -597,6 +594,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -628,6 +626,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -698,8 +697,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -796,11 +793,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -811,13 +804,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -829,6 +822,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -862,8 +856,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
@RELEASE_PRESENT_TRUE@NP_VERSION = $(PACKAGE_VERSION)
 AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
@ -1003,7 +1000,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@ -1031,124 +1028,124 @@ clean-libexecPROGRAMS:
 	done
 check_apt$(EXEEXT): $(check_apt_OBJECTS) $(check_apt_DEPENDENCIES) 
 	@rm -f check_apt$(EXEEXT)
-	$(LINK) $(check_apt_LDFLAGS) $(check_apt_OBJECTS) $(check_apt_LDADD) $(LIBS)
+	$(LINK) $(check_apt_OBJECTS) $(check_apt_LDADD) $(LIBS)
 check_by_ssh$(EXEEXT): $(check_by_ssh_OBJECTS) $(check_by_ssh_DEPENDENCIES) 
 	@rm -f check_by_ssh$(EXEEXT)
-	$(LINK) $(check_by_ssh_LDFLAGS) $(check_by_ssh_OBJECTS) $(check_by_ssh_LDADD) $(LIBS)
+	$(LINK) $(check_by_ssh_OBJECTS) $(check_by_ssh_LDADD) $(LIBS)
 check_cluster$(EXEEXT): $(check_cluster_OBJECTS) $(check_cluster_DEPENDENCIES) 
 	@rm -f check_cluster$(EXEEXT)
-	$(LINK) $(check_cluster_LDFLAGS) $(check_cluster_OBJECTS) $(check_cluster_LDADD) $(LIBS)
+	$(LINK) $(check_cluster_OBJECTS) $(check_cluster_LDADD) $(LIBS)
 check_dig$(EXEEXT): $(check_dig_OBJECTS) $(check_dig_DEPENDENCIES) 
 	@rm -f check_dig$(EXEEXT)
-	$(LINK) $(check_dig_LDFLAGS) $(check_dig_OBJECTS) $(check_dig_LDADD) $(LIBS)
+	$(LINK) $(check_dig_OBJECTS) $(check_dig_LDADD) $(LIBS)
 check_disk$(EXEEXT): $(check_disk_OBJECTS) $(check_disk_DEPENDENCIES) 
 	@rm -f check_disk$(EXEEXT)
-	$(LINK) $(check_disk_LDFLAGS) $(check_disk_OBJECTS) $(check_disk_LDADD) $(LIBS)
+	$(LINK) $(check_disk_OBJECTS) $(check_disk_LDADD) $(LIBS)
 check_dns$(EXEEXT): $(check_dns_OBJECTS) $(check_dns_DEPENDENCIES) 
 	@rm -f check_dns$(EXEEXT)
-	$(LINK) $(check_dns_LDFLAGS) $(check_dns_OBJECTS) $(check_dns_LDADD) $(LIBS)
+	$(LINK) $(check_dns_OBJECTS) $(check_dns_LDADD) $(LIBS)
 check_dummy$(EXEEXT): $(check_dummy_OBJECTS) $(check_dummy_DEPENDENCIES) 
 	@rm -f check_dummy$(EXEEXT)
-	$(LINK) $(check_dummy_LDFLAGS) $(check_dummy_OBJECTS) $(check_dummy_LDADD) $(LIBS)
+	$(LINK) $(check_dummy_OBJECTS) $(check_dummy_LDADD) $(LIBS)
 check_fping$(EXEEXT): $(check_fping_OBJECTS) $(check_fping_DEPENDENCIES) 
 	@rm -f check_fping$(EXEEXT)
-	$(LINK) $(check_fping_LDFLAGS) $(check_fping_OBJECTS) $(check_fping_LDADD) $(LIBS)
+	$(LINK) $(check_fping_OBJECTS) $(check_fping_LDADD) $(LIBS)
 check_game$(EXEEXT): $(check_game_OBJECTS) $(check_game_DEPENDENCIES) 
 	@rm -f check_game$(EXEEXT)
-	$(LINK) $(check_game_LDFLAGS) $(check_game_OBJECTS) $(check_game_LDADD) $(LIBS)
+	$(LINK) $(check_game_OBJECTS) $(check_game_LDADD) $(LIBS)
 check_hpjd$(EXEEXT): $(check_hpjd_OBJECTS) $(check_hpjd_DEPENDENCIES) 
 	@rm -f check_hpjd$(EXEEXT)
-	$(LINK) $(check_hpjd_LDFLAGS) $(check_hpjd_OBJECTS) $(check_hpjd_LDADD) $(LIBS)
+	$(LINK) $(check_hpjd_OBJECTS) $(check_hpjd_LDADD) $(LIBS)
 check_http$(EXEEXT): $(check_http_OBJECTS) $(check_http_DEPENDENCIES) 
 	@rm -f check_http$(EXEEXT)
-	$(LINK) $(check_http_LDFLAGS) $(check_http_OBJECTS) $(check_http_LDADD) $(LIBS)
+	$(LINK) $(check_http_OBJECTS) $(check_http_LDADD) $(LIBS)
 check_ide_smart$(EXEEXT): $(check_ide_smart_OBJECTS) $(check_ide_smart_DEPENDENCIES) 
 	@rm -f check_ide_smart$(EXEEXT)
-	$(LINK) $(check_ide_smart_LDFLAGS) $(check_ide_smart_OBJECTS) $(check_ide_smart_LDADD) $(LIBS)
+	$(LINK) $(check_ide_smart_OBJECTS) $(check_ide_smart_LDADD) $(LIBS)
 check_ldap$(EXEEXT): $(check_ldap_OBJECTS) $(check_ldap_DEPENDENCIES) 
 	@rm -f check_ldap$(EXEEXT)
-	$(LINK) $(check_ldap_LDFLAGS) $(check_ldap_OBJECTS) $(check_ldap_LDADD) $(LIBS)
+	$(LINK) $(check_ldap_OBJECTS) $(check_ldap_LDADD) $(LIBS)
 check_load$(EXEEXT): $(check_load_OBJECTS) $(check_load_DEPENDENCIES) 
 	@rm -f check_load$(EXEEXT)
-	$(LINK) $(check_load_LDFLAGS) $(check_load_OBJECTS) $(check_load_LDADD) $(LIBS)
+	$(LINK) $(check_load_OBJECTS) $(check_load_LDADD) $(LIBS)
 check_mrtg$(EXEEXT): $(check_mrtg_OBJECTS) $(check_mrtg_DEPENDENCIES) 
 	@rm -f check_mrtg$(EXEEXT)
-	$(LINK) $(check_mrtg_LDFLAGS) $(check_mrtg_OBJECTS) $(check_mrtg_LDADD) $(LIBS)
+	$(LINK) $(check_mrtg_OBJECTS) $(check_mrtg_LDADD) $(LIBS)
 check_mrtgtraf$(EXEEXT): $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_DEPENDENCIES) 
 	@rm -f check_mrtgtraf$(EXEEXT)
-	$(LINK) $(check_mrtgtraf_LDFLAGS) $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_LDADD) $(LIBS)
+	$(LINK) $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_LDADD) $(LIBS)
 check_mysql$(EXEEXT): $(check_mysql_OBJECTS) $(check_mysql_DEPENDENCIES) 
 	@rm -f check_mysql$(EXEEXT)
-	$(LINK) $(check_mysql_LDFLAGS) $(check_mysql_OBJECTS) $(check_mysql_LDADD) $(LIBS)
+	$(check_mysql_LINK) $(check_mysql_OBJECTS) $(check_mysql_LDADD) $(LIBS)
 check_mysql_query$(EXEEXT): $(check_mysql_query_OBJECTS) $(check_mysql_query_DEPENDENCIES) 
 	@rm -f check_mysql_query$(EXEEXT)
-	$(LINK) $(check_mysql_query_LDFLAGS) $(check_mysql_query_OBJECTS) $(check_mysql_query_LDADD) $(LIBS)
+	$(check_mysql_query_LINK) $(check_mysql_query_OBJECTS) $(check_mysql_query_LDADD) $(LIBS)
 check_nagios$(EXEEXT): $(check_nagios_OBJECTS) $(check_nagios_DEPENDENCIES) 
 	@rm -f check_nagios$(EXEEXT)
-	$(LINK) $(check_nagios_LDFLAGS) $(check_nagios_OBJECTS) $(check_nagios_LDADD) $(LIBS)
+	$(LINK) $(check_nagios_OBJECTS) $(check_nagios_LDADD) $(LIBS)
 check_nt$(EXEEXT): $(check_nt_OBJECTS) $(check_nt_DEPENDENCIES) 
 	@rm -f check_nt$(EXEEXT)
-	$(LINK) $(check_nt_LDFLAGS) $(check_nt_OBJECTS) $(check_nt_LDADD) $(LIBS)
+	$(LINK) $(check_nt_OBJECTS) $(check_nt_LDADD) $(LIBS)
 check_ntp$(EXEEXT): $(check_ntp_OBJECTS) $(check_ntp_DEPENDENCIES) 
 	@rm -f check_ntp$(EXEEXT)
-	$(LINK) $(check_ntp_LDFLAGS) $(check_ntp_OBJECTS) $(check_ntp_LDADD) $(LIBS)
+	$(LINK) $(check_ntp_OBJECTS) $(check_ntp_LDADD) $(LIBS)
 check_ntp_peer$(EXEEXT): $(check_ntp_peer_OBJECTS) $(check_ntp_peer_DEPENDENCIES) 
 	@rm -f check_ntp_peer$(EXEEXT)
-	$(LINK) $(check_ntp_peer_LDFLAGS) $(check_ntp_peer_OBJECTS) $(check_ntp_peer_LDADD) $(LIBS)
+	$(LINK) $(check_ntp_peer_OBJECTS) $(check_ntp_peer_LDADD) $(LIBS)
 check_ntp_time$(EXEEXT): $(check_ntp_time_OBJECTS) $(check_ntp_time_DEPENDENCIES) 
 	@rm -f check_ntp_time$(EXEEXT)
-	$(LINK) $(check_ntp_time_LDFLAGS) $(check_ntp_time_OBJECTS) $(check_ntp_time_LDADD) $(LIBS)
+	$(LINK) $(check_ntp_time_OBJECTS) $(check_ntp_time_LDADD) $(LIBS)
 check_nwstat$(EXEEXT): $(check_nwstat_OBJECTS) $(check_nwstat_DEPENDENCIES) 
 	@rm -f check_nwstat$(EXEEXT)
-	$(LINK) $(check_nwstat_LDFLAGS) $(check_nwstat_OBJECTS) $(check_nwstat_LDADD) $(LIBS)
+	$(LINK) $(check_nwstat_OBJECTS) $(check_nwstat_LDADD) $(LIBS)
 check_overcr$(EXEEXT): $(check_overcr_OBJECTS) $(check_overcr_DEPENDENCIES) 
 	@rm -f check_overcr$(EXEEXT)
-	$(LINK) $(check_overcr_LDFLAGS) $(check_overcr_OBJECTS) $(check_overcr_LDADD) $(LIBS)
+	$(LINK) $(check_overcr_OBJECTS) $(check_overcr_LDADD) $(LIBS)
 check_pgsql$(EXEEXT): $(check_pgsql_OBJECTS) $(check_pgsql_DEPENDENCIES) 
 	@rm -f check_pgsql$(EXEEXT)
-	$(LINK) $(check_pgsql_LDFLAGS) $(check_pgsql_OBJECTS) $(check_pgsql_LDADD) $(LIBS)
+	$(LINK) $(check_pgsql_OBJECTS) $(check_pgsql_LDADD) $(LIBS)
 check_ping$(EXEEXT): $(check_ping_OBJECTS) $(check_ping_DEPENDENCIES) 
 	@rm -f check_ping$(EXEEXT)
-	$(LINK) $(check_ping_LDFLAGS) $(check_ping_OBJECTS) $(check_ping_LDADD) $(LIBS)
+	$(LINK) $(check_ping_OBJECTS) $(check_ping_LDADD) $(LIBS)
 check_procs$(EXEEXT): $(check_procs_OBJECTS) $(check_procs_DEPENDENCIES) 
 	@rm -f check_procs$(EXEEXT)
-	$(LINK) $(check_procs_LDFLAGS) $(check_procs_OBJECTS) $(check_procs_LDADD) $(LIBS)
+	$(LINK) $(check_procs_OBJECTS) $(check_procs_LDADD) $(LIBS)
 check_radius$(EXEEXT): $(check_radius_OBJECTS) $(check_radius_DEPENDENCIES) 
 	@rm -f check_radius$(EXEEXT)
-	$(LINK) $(check_radius_LDFLAGS) $(check_radius_OBJECTS) $(check_radius_LDADD) $(LIBS)
+	$(LINK) $(check_radius_OBJECTS) $(check_radius_LDADD) $(LIBS)
 check_real$(EXEEXT): $(check_real_OBJECTS) $(check_real_DEPENDENCIES) 
 	@rm -f check_real$(EXEEXT)
-	$(LINK) $(check_real_LDFLAGS) $(check_real_OBJECTS) $(check_real_LDADD) $(LIBS)
+	$(LINK) $(check_real_OBJECTS) $(check_real_LDADD) $(LIBS)
 check_smtp$(EXEEXT): $(check_smtp_OBJECTS) $(check_smtp_DEPENDENCIES) 
 	@rm -f check_smtp$(EXEEXT)
-	$(LINK) $(check_smtp_LDFLAGS) $(check_smtp_OBJECTS) $(check_smtp_LDADD) $(LIBS)
+	$(LINK) $(check_smtp_OBJECTS) $(check_smtp_LDADD) $(LIBS)
 check_snmp$(EXEEXT): $(check_snmp_OBJECTS) $(check_snmp_DEPENDENCIES) 
 	@rm -f check_snmp$(EXEEXT)
-	$(LINK) $(check_snmp_LDFLAGS) $(check_snmp_OBJECTS) $(check_snmp_LDADD) $(LIBS)
+	$(LINK) $(check_snmp_OBJECTS) $(check_snmp_LDADD) $(LIBS)
 check_ssh$(EXEEXT): $(check_ssh_OBJECTS) $(check_ssh_DEPENDENCIES) 
 	@rm -f check_ssh$(EXEEXT)
-	$(LINK) $(check_ssh_LDFLAGS) $(check_ssh_OBJECTS) $(check_ssh_LDADD) $(LIBS)
+	$(LINK) $(check_ssh_OBJECTS) $(check_ssh_LDADD) $(LIBS)
 check_swap$(EXEEXT): $(check_swap_OBJECTS) $(check_swap_DEPENDENCIES) 
 	@rm -f check_swap$(EXEEXT)
-	$(LINK) $(check_swap_LDFLAGS) $(check_swap_OBJECTS) $(check_swap_LDADD) $(LIBS)
+	$(LINK) $(check_swap_OBJECTS) $(check_swap_LDADD) $(LIBS)
 check_tcp$(EXEEXT): $(check_tcp_OBJECTS) $(check_tcp_DEPENDENCIES) 
 	@rm -f check_tcp$(EXEEXT)
-	$(LINK) $(check_tcp_LDFLAGS) $(check_tcp_OBJECTS) $(check_tcp_LDADD) $(LIBS)
+	$(LINK) $(check_tcp_OBJECTS) $(check_tcp_LDADD) $(LIBS)
 check_time$(EXEEXT): $(check_time_OBJECTS) $(check_time_DEPENDENCIES) 
 	@rm -f check_time$(EXEEXT)
-	$(LINK) $(check_time_LDFLAGS) $(check_time_OBJECTS) $(check_time_LDADD) $(LIBS)
+	$(LINK) $(check_time_OBJECTS) $(check_time_LDADD) $(LIBS)
 check_ups$(EXEEXT): $(check_ups_OBJECTS) $(check_ups_DEPENDENCIES) 
 	@rm -f check_ups$(EXEEXT)
-	$(LINK) $(check_ups_LDFLAGS) $(check_ups_OBJECTS) $(check_ups_LDADD) $(LIBS)
+	$(LINK) $(check_ups_OBJECTS) $(check_ups_LDADD) $(LIBS)
 check_users$(EXEEXT): $(check_users_OBJECTS) $(check_users_DEPENDENCIES) 
 	@rm -f check_users$(EXEEXT)
-	$(LINK) $(check_users_LDFLAGS) $(check_users_OBJECTS) $(check_users_LDADD) $(LIBS)
+	$(LINK) $(check_users_OBJECTS) $(check_users_LDADD) $(LIBS)
 negate$(EXEEXT): $(negate_OBJECTS) $(negate_DEPENDENCIES) 
 	@rm -f negate$(EXEEXT)
-	$(LINK) $(negate_LDFLAGS) $(negate_OBJECTS) $(negate_LDADD) $(LIBS)
+	$(LINK) $(negate_OBJECTS) $(negate_LDADD) $(LIBS)
 urlize$(EXEEXT): $(urlize_OBJECTS) $(urlize_DEPENDENCIES) 
 	@rm -f urlize$(EXEEXT)
-	$(LINK) $(urlize_LDFLAGS) $(urlize_OBJECTS) $(urlize_LDADD) $(LIBS)
+	$(LINK) $(urlize_OBJECTS) $(urlize_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -1198,50 +1195,50 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlize.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 check_mysql-check_mysql.o: check_mysql.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.o -MD -MP -MF "$(DEPDIR)/check_mysql-check_mysql.Tpo" -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.o -MD -MP -MF $(DEPDIR)/check_mysql-check_mysql.Tpo -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/check_mysql-check_mysql.Tpo" "$(DEPDIR)/check_mysql-check_mysql.Po"; else rm -f "$(DEPDIR)/check_mysql-check_mysql.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_mysql-check_mysql.Tpo $(DEPDIR)/check_mysql-check_mysql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_mysql.c' object='check_mysql-check_mysql.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c
 check_mysql-check_mysql.obj: check_mysql.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.obj -MD -MP -MF "$(DEPDIR)/check_mysql-check_mysql.Tpo" -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi`; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.obj -MD -MP -MF $(DEPDIR)/check_mysql-check_mysql.Tpo -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/check_mysql-check_mysql.Tpo" "$(DEPDIR)/check_mysql-check_mysql.Po"; else rm -f "$(DEPDIR)/check_mysql-check_mysql.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_mysql-check_mysql.Tpo $(DEPDIR)/check_mysql-check_mysql.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_mysql.c' object='check_mysql-check_mysql.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi`
 check_mysql_query-check_mysql_query.o: check_mysql_query.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.o -MD -MP -MF "$(DEPDIR)/check_mysql_query-check_mysql_query.Tpo" -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.o -MD -MP -MF $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/check_mysql_query-check_mysql_query.Tpo" "$(DEPDIR)/check_mysql_query-check_mysql_query.Po"; else rm -f "$(DEPDIR)/check_mysql_query-check_mysql_query.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo $(DEPDIR)/check_mysql_query-check_mysql_query.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_mysql_query.c' object='check_mysql_query-check_mysql_query.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c
 check_mysql_query-check_mysql_query.obj: check_mysql_query.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.obj -MD -MP -MF "$(DEPDIR)/check_mysql_query-check_mysql_query.Tpo" -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi`; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.obj -MD -MP -MF $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/check_mysql_query-check_mysql_query.Tpo" "$(DEPDIR)/check_mysql_query-check_mysql_query.Po"; else rm -f "$(DEPDIR)/check_mysql_query-check_mysql_query.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo $(DEPDIR)/check_mysql_query-check_mysql_query.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_mysql_query.c' object='check_mysql_query-check_mysql_query.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi`
@ -1252,10 +1249,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@ -1305,9 +1298,9 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@ -1316,7 +1309,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@ -1328,7 +1321,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@ -1378,22 +1371,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -1410,7 +1402,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) all-local
 installdirs:
 	for dir in "$(DESTDIR)$(libexecdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@ -1445,7 +1437,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 dvi: dvi-am
@ -1459,14 +1451,22 @@ info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-exec-am: install-libexecPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -1487,22 +1487,25 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
+uninstall-am: uninstall-libexecPROGRAMS uninstall-local
-	uninstall-local
+
 .MAKE: install-am install-exec-am install-strip
 .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
 	clean clean-generic clean-libexecPROGRAMS clean-libtool \
 	clean-local ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-exec-hook install-info install-info-am \
+	install-exec install-exec-am install-exec-hook install-html \
-	install-libexecPROGRAMS install-man install-strip installcheck \
+	install-html-am install-info install-info-am \
 	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
+	tags uninstall uninstall-am uninstall-libexecPROGRAMS \
-	uninstall-libexecPROGRAMS uninstall-local
+	uninstall-local
@RELEASE_PRESENT_FALSE@NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
@RELEASE_PRESENT_FALSE@	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@ -261,6 +261,11 @@ print_help(void)
 	printf (_(UT_EXTRA_OPTS_NOTES));
 #endif
 	printf ("\n");
 	printf ("%s\n", _("Examples:"));
 	printf (" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:");
 	printf ("    %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK state") );
 	printf(_(UT_SUPPORT));
 }
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@ -100,7 +100,7 @@ size_t nunits = 0;
 size_t unitv_size = 8;
 int numoids = 0;
 int numauthpriv = 0;
-int verbose = FALSE;
+int verbose = 0;
 int usesnmpgetnext = FALSE;
 char *warning_thresholds = NULL;
 char *critical_thresholds = NULL;
@ -207,7 +207,7 @@ main (int argc, char **argv)
 	/* This is just for display purposes, so it can remain a string */
 	asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
-		snmpcmd, timeout_interval, retries, miblist, proto, "[authpriv]",
+		snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
 		server_address, port);
 	for (i = 0; i < numoids; i++) {
@ -255,12 +255,17 @@ main (int argc, char **argv)
 		ptr = chld_out.line[i];
 		oidname = strpcpy (oidname, ptr, delimiter);
 		response = strstr (ptr, delimiter);
 		if (response == NULL)
 			break;
-		/* We strip out the datatype indicator for PHBs */
+		if (verbose > 2) {
 			printf("Processing line %i\n  oidname: %s\n  response: %s\n", i+1, oidname, response);
 		}
 		/* Clean up type array - Sol10 does not necessarily zero it out */
 		bzero(type, sizeof(type));
 		/* We strip out the datatype indicator for PHBs */
 		if (strstr (response, "Gauge: "))
 			show = strstr (response, "Gauge: ") + 7;
 		else if (strstr (response, "Gauge32: "))
@ -431,7 +436,7 @@ process_arguments (int argc, char **argv)
 			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'v': /* verbose */
-			verbose = TRUE;
+			verbose++;
 			break;
 	/* Connection info */
@ -644,7 +649,7 @@ validate_arguments ()
 		if ( needmibs == TRUE ) {
 			miblist = strdup (DEFAULT_MIBLIST);
 		}else{
-			miblist = "''";			/* don't read any mib files for numeric oids */
+			miblist = "";			/* don't read any mib files for numeric oids */
 		}
 	}
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@ -23,7 +23,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
-* $Id: check_tcp.c 2153 2009-02-21 09:59:24Z dermoth $
+* $Id$
 * 
 *****************************************************************************/
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@ -8,7 +8,7 @@ use strict;
 use Test::More;
 use NPTest;
-my $tests = 44;
+my $tests = 46;
 plan tests => $tests;
 my $res;
@ -44,7 +44,7 @@ SKIP: {
 	like( $res->output, "/check_snmp: Invalid SNMP version - 3c/" );
 	SKIP: {
-		skip "no snmp host defined", 32 if ( ! $host_snmp );
+		skip "no snmp host defined", 34 if ( ! $host_snmp );
 		$res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
 		cmp_ok( $res->return_code, '==', 0, "Exit OK when querying uptime" ); 
@ -54,6 +54,10 @@ SKIP: {
 		cmp_ok( $value, ">", 0, "Got a time value" );
 		like($res->perf_output, "/sysUpTime.*$1/", "Got perfdata with value '$1' in it");
 		$res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o .1.3.6.1.2.1.1.3.0 -w 1: -c 1:");
 		cmp_ok( $res->return_code, '==', 0, "Test with numeric OID (no mibs loaded)" );
 		like($res->output, '/^SNMP OK - \d+/', "String contains SNMP OK");
 		$res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysDescr.0");
 		cmp_ok( $res->return_code, '==', 0, "Exit OK when querying sysDescr" ); 
 		unlike($res->perf_output, '/sysDescr/', "Perfdata doesn't contain string values");
@ -95,11 +99,11 @@ SKIP: {
 		my $lower = $1 - 0.05;
 		my $higher = $1 + 0.05;
 		$res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o enterprises.ucdavis.laTable.laEntry.laLoad.3 -w $lower -c $higher");
-		cmp_ok( $res->return_code, '==', 1, "Exit WARNING with fractionnal arcuments");
+		cmp_ok( $res->return_code, '==', 1, "Exit WARNING with fractionnal arguments");
 		$res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0,host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w ,:0 -c ,:2");
 		cmp_ok( $res->return_code, '==', 1, "Exit WARNING on 2nd threshold");
-		like($res->output, '/^SNMP WARNING - Timeticks:\s\(\d+\)\s.*,\s.*\s\*1\*\s.*$/', "First OID returned as string, 2nd checked for thresholds");
+		like($res->output, '/^SNMP WARNING - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s+\*1\*\s.*$/', "First OID returned as string, 2nd checked for thresholds");
 		$res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w '' -c ''");
 		cmp_ok( $res->return_code, '==', 0, "Empty thresholds doesn't crash");
--- a/po/de.gmo
+++ b/po/de.gmo
--- a/po/de.po
+++ b/po/de.po
@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-17 13:03+0100\n"
+"POT-Creation-Date: 2009-09-16 09:39+0100\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
@ -63,7 +63,7 @@ msgstr ""
 #: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
 #: plugins/check_http.c:250 plugins/check_ldap.c:292 plugins/check_pgsql.c:250
 #: plugins/check_procs.c:364 plugins/check_radius.c:286
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:476
+#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:481
 #: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
 #: plugins/check_ups.c:556 plugins/negate.c:161
 msgid "Timeout interval must be a positive integer"
@ -219,11 +219,11 @@ msgid ""
 "all of -O, -s, and -n options (servicelist order must match '-C'options)"
 msgstr ""
-#: plugins/check_by_ssh.c:438 plugins/check_dig.c:342 plugins/check_disk.c:969
+#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:265
-#: plugins/check_http.c:1384 plugins/check_nagios.c:308
+#: plugins/check_dig.c:342 plugins/check_disk.c:969 plugins/check_http.c:1384
-#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:663
+#: plugins/check_nagios.c:308 plugins/check_ntp.c:868
-#: plugins/check_ntp_time.c:632 plugins/check_procs.c:748 plugins/negate.c:268
+#: plugins/check_ntp_peer.c:663 plugins/check_ntp_time.c:632
-#: plugins/urlize.c:180
+#: plugins/check_procs.c:748 plugins/negate.c:268 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
@ -238,7 +238,7 @@ msgstr ""
 #: plugins/check_overcr.c:456 plugins/check_pgsql.c:471
 #: plugins/check_ping.c:597 plugins/check_procs.c:743
 #: plugins/check_radius.c:355 plugins/check_real.c:445
-#: plugins/check_smtp.c:813 plugins/check_snmp.c:873 plugins/check_ssh.c:296
+#: plugins/check_smtp.c:813 plugins/check_snmp.c:878 plugins/check_ssh.c:296
 #: plugins/check_swap.c:547 plugins/check_tcp.c:646 plugins/check_time.c:365
 #: plugins/check_ups.c:642 plugins/check_users.c:224
 #: plugins/check_ide_smart.c:511 plugins/negate.c:274
@ -246,7 +246,7 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
-#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:272
+#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:277
 #: plugins/check_dig.c:360 plugins/check_disk.c:986 plugins/check_dns.c:492
 #: plugins/check_dummy.c:122 plugins/check_fping.c:438
 #: plugins/check_game.c:335 plugins/check_hpjd.c:420 plugins/check_http.c:1407
@ -256,7 +256,7 @@ msgstr ""
 #: plugins/check_ntp_time.c:641 plugins/check_nwstat.c:1688
 #: plugins/check_overcr.c:471 plugins/check_pgsql.c:483
 #: plugins/check_ping.c:607 plugins/check_radius.c:367
-#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:895
+#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:900
 #: plugins/check_ssh.c:308 plugins/check_swap.c:563 plugins/check_tcp.c:657
 #: plugins/check_time.c:377 plugins/check_ups.c:664 plugins/check_users.c:235
 #: plugins/check_ide_smart.c:533 plugins/negate.c:292 plugins/urlize.c:197
@ -306,6 +306,12 @@ msgstr ""
 msgid "commas"
 msgstr ""
 #: plugins/check_cluster.c:267
 msgid ""
 "Will alert critical if there are 3 or more service data points in a non-OK "
 "state"
 msgstr ""
 #: plugins/check_dig.c:99 plugins/check_dig.c:101
 #, c-format
 msgid "Looking for: '%s'\n"
@ -4047,7 +4053,7 @@ msgstr ""
 msgid "CRITICAL - Cannot retrieve server certificate."
 msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:533
+#: plugins/check_smtp.c:311 plugins/check_snmp.c:538
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
@ -4057,7 +4063,7 @@ msgstr ""
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:315
+#: plugins/check_smtp.c:324 plugins/check_snmp.c:320
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
@ -4207,214 +4213,214 @@ msgstr "Papierfehler"
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
-#: plugins/check_snmp.c:293
+#: plugins/check_snmp.c:298
 msgid "No valid data returned"
 msgstr ""
-#: plugins/check_snmp.c:491
+#: plugins/check_snmp.c:496
 #, fuzzy
 msgid "Retries interval must be a positive integer"
 msgstr "Time interval muss ein positiver Integer sein"
-#: plugins/check_snmp.c:554
+#: plugins/check_snmp.c:559
 #, fuzzy, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Konnte addr nicht zuweisen\n"
-#: plugins/check_snmp.c:566
+#: plugins/check_snmp.c:571
 #, fuzzy
 msgid "Could not reallocate labels\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
-#: plugins/check_snmp.c:583
+#: plugins/check_snmp.c:588
 #, fuzzy, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
-#: plugins/check_snmp.c:595
+#: plugins/check_snmp.c:600
 msgid "Could not realloc() units\n"
 msgstr ""
-#: plugins/check_snmp.c:653
+#: plugins/check_snmp.c:658
 #, fuzzy
 msgid "No host specified\n"
 msgstr ""
 "Kein Hostname angegeben\n"
 "\n"
-#: plugins/check_snmp.c:657
+#: plugins/check_snmp.c:662
 #, fuzzy
 msgid "No OIDs specified\n"
 msgstr ""
 "Kein Hostname angegeben\n"
 "\n"
-#: plugins/check_snmp.c:679
+#: plugins/check_snmp.c:684
 msgid "Invalid seclevel"
 msgstr ""
-#: plugins/check_snmp.c:686 plugins/check_snmp.c:689 plugins/check_snmp.c:707
+#: plugins/check_snmp.c:691 plugins/check_snmp.c:694 plugins/check_snmp.c:712
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
-#: plugins/check_snmp.c:728
+#: plugins/check_snmp.c:733
 msgid "Invalid SNMP version"
 msgstr ""
-#: plugins/check_snmp.c:745
+#: plugins/check_snmp.c:750
 msgid "Unbalanced quotes\n"
 msgstr ""
-#: plugins/check_snmp.c:794
+#: plugins/check_snmp.c:799
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
-#: plugins/check_snmp.c:807
+#: plugins/check_snmp.c:812
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr ""
-#: plugins/check_snmp.c:809
+#: plugins/check_snmp.c:814
 msgid "SNMP protocol version"
 msgstr ""
-#: plugins/check_snmp.c:811
+#: plugins/check_snmp.c:816
 msgid "SNMPv3 securityLevel"
 msgstr ""
-#: plugins/check_snmp.c:813
+#: plugins/check_snmp.c:818
 msgid "SNMPv3 auth proto"
 msgstr ""
-#: plugins/check_snmp.c:815
+#: plugins/check_snmp.c:820
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
-#: plugins/check_snmp.c:819
+#: plugins/check_snmp.c:824
 msgid "Optional community string for SNMP communication"
 msgstr ""
-#: plugins/check_snmp.c:820
+#: plugins/check_snmp.c:825
 msgid "default is"
 msgstr ""
-#: plugins/check_snmp.c:822
+#: plugins/check_snmp.c:827
 msgid "SNMPv3 username"
 msgstr ""
-#: plugins/check_snmp.c:824
+#: plugins/check_snmp.c:829
 msgid "SNMPv3 authentication password"
 msgstr ""
-#: plugins/check_snmp.c:826
+#: plugins/check_snmp.c:831
 msgid "SNMPv3 privacy password"
 msgstr ""
-#: plugins/check_snmp.c:830
+#: plugins/check_snmp.c:835
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
-#: plugins/check_snmp.c:832
+#: plugins/check_snmp.c:837
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
-#: plugins/check_snmp.c:833
+#: plugins/check_snmp.c:838
 msgid "for symbolic OIDs.)"
 msgstr ""
-#: plugins/check_snmp.c:835
+#: plugins/check_snmp.c:840
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
-#: plugins/check_snmp.c:836
+#: plugins/check_snmp.c:841
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
-#: plugins/check_snmp.c:837
+#: plugins/check_snmp.c:842
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
-#: plugins/check_snmp.c:841
+#: plugins/check_snmp.c:846
 #, fuzzy
 msgid "Warning threshold range(s)"
 msgstr "Warning threshold  Integer sein"
-#: plugins/check_snmp.c:843
+#: plugins/check_snmp.c:848
 #, fuzzy
 msgid "Critical threshold range(s)"
 msgstr "Critical threshold muss ein Integer sein"
-#: plugins/check_snmp.c:847
+#: plugins/check_snmp.c:852
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
-#: plugins/check_snmp.c:849
+#: plugins/check_snmp.c:854
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
-#: plugins/check_snmp.c:851
+#: plugins/check_snmp.c:856
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
-#: plugins/check_snmp.c:853
+#: plugins/check_snmp.c:858
 msgid "Prefix label for output from plugin (default -s 'SNMP')"
 msgstr ""
-#: plugins/check_snmp.c:857
+#: plugins/check_snmp.c:862
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
-#: plugins/check_snmp.c:859
+#: plugins/check_snmp.c:864
 msgid "Separates output on multiple OID requests"
 msgstr ""
-#: plugins/check_snmp.c:863
+#: plugins/check_snmp.c:868
 msgid "Number of retries to be used in the requests"
 msgstr ""
-#: plugins/check_snmp.c:868
+#: plugins/check_snmp.c:873
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
-#: plugins/check_snmp.c:869
+#: plugins/check_snmp.c:874
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
-#: plugins/check_snmp.c:870
+#: plugins/check_snmp.c:875
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr ""
-#: plugins/check_snmp.c:874
+#: plugins/check_snmp.c:879
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with"
 msgstr ""
-#: plugins/check_snmp.c:875
+#: plugins/check_snmp.c:880
 msgid "internal spaces must be quoted) [max 8 OIDs]"
 msgstr ""
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:884
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
-#: plugins/check_snmp.c:880
+#: plugins/check_snmp.c:885
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
-#: plugins/check_snmp.c:881
+#: plugins/check_snmp.c:886
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
-#: plugins/check_snmp.c:882
+#: plugins/check_snmp.c:887
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
--- a/po/fr.gmo
+++ b/po/fr.gmo
--- a/po/fr.po
+++ b/po/fr.po
@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-17 13:03+0100\n"
+"POT-Creation-Date: 2009-09-16 09:39+0100\n"
 "PO-Revision-Date: 2007-12-10 02:10-0500\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
 "Language-Team:  <en@li.org>\n"
@ -65,7 +65,7 @@ msgstr "Erreur lors de l'utilisation de %s\n"
 #: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
 #: plugins/check_http.c:250 plugins/check_ldap.c:292 plugins/check_pgsql.c:250
 #: plugins/check_procs.c:364 plugins/check_radius.c:286
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:476
+#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:481
 #: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
 #: plugins/check_ups.c:556 plugins/negate.c:161
 msgid "Timeout interval must be a positive integer"
@ -221,11 +221,11 @@ msgstr ""
 "et les options -O, -s, n (l'ordre des services doit correspondre aux "
 "multiples options '-C)"
-#: plugins/check_by_ssh.c:438 plugins/check_dig.c:342 plugins/check_disk.c:969
+#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:265
-#: plugins/check_http.c:1384 plugins/check_nagios.c:308
+#: plugins/check_dig.c:342 plugins/check_disk.c:969 plugins/check_http.c:1384
-#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:663
+#: plugins/check_nagios.c:308 plugins/check_ntp.c:868
-#: plugins/check_ntp_time.c:632 plugins/check_procs.c:748 plugins/negate.c:268
+#: plugins/check_ntp_peer.c:663 plugins/check_ntp_time.c:632
-#: plugins/urlize.c:180
+#: plugins/check_procs.c:748 plugins/negate.c:268 plugins/urlize.c:180
 msgid "Examples:"
 msgstr "Exemples:"
@ -240,7 +240,7 @@ msgstr "Exemples:"
 #: plugins/check_overcr.c:456 plugins/check_pgsql.c:471
 #: plugins/check_ping.c:597 plugins/check_procs.c:743
 #: plugins/check_radius.c:355 plugins/check_real.c:445
-#: plugins/check_smtp.c:813 plugins/check_snmp.c:873 plugins/check_ssh.c:296
+#: plugins/check_smtp.c:813 plugins/check_snmp.c:878 plugins/check_ssh.c:296
 #: plugins/check_swap.c:547 plugins/check_tcp.c:646 plugins/check_time.c:365
 #: plugins/check_ups.c:642 plugins/check_users.c:224
 #: plugins/check_ide_smart.c:511 plugins/negate.c:274
@ -248,7 +248,7 @@ msgstr "Exemples:"
 msgid "Notes:"
 msgstr "Notes:"
-#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:272
+#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:277
 #: plugins/check_dig.c:360 plugins/check_disk.c:986 plugins/check_dns.c:492
 #: plugins/check_dummy.c:122 plugins/check_fping.c:438
 #: plugins/check_game.c:335 plugins/check_hpjd.c:420 plugins/check_http.c:1407
@ -258,7 +258,7 @@ msgstr "Notes:"
 #: plugins/check_ntp_time.c:641 plugins/check_nwstat.c:1688
 #: plugins/check_overcr.c:471 plugins/check_pgsql.c:483
 #: plugins/check_ping.c:607 plugins/check_radius.c:367
-#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:895
+#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:900
 #: plugins/check_ssh.c:308 plugins/check_swap.c:563 plugins/check_tcp.c:657
 #: plugins/check_time.c:377 plugins/check_ups.c:664 plugins/check_users.c:235
 #: plugins/check_ide_smart.c:533 plugins/negate.c:292 plugins/urlize.c:197
@ -308,6 +308,12 @@ msgstr "Les codes d'état des hôtes ou des services du cluster, séparés par d
 msgid "commas"
 msgstr "virgules"
 #: plugins/check_cluster.c:267
 msgid ""
 "Will alert critical if there are 3 or more service data points in a non-OK "
 "state"
 msgstr ""
 #: plugins/check_dig.c:99 plugins/check_dig.c:101
 #, c-format
 msgid "Looking for: '%s'\n"
@ -4131,7 +4137,7 @@ msgstr ""
 msgid "CRITICAL - Cannot retrieve server certificate."
 msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur"
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:533
+#: plugins/check_smtp.c:311 plugins/check_snmp.c:538
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr "Impossible de compiler l'expression rationnelle"
@ -4141,7 +4147,7 @@ msgstr "Impossible de compiler l'expression rationnelle"
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n"
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:315
+#: plugins/check_smtp.c:324 plugins/check_snmp.c:320
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr "Erreur d'exécution: %s\n"
@ -4292,213 +4298,213 @@ msgstr "Erreur d'exécution: %s\n"
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
-#: plugins/check_snmp.c:293
+#: plugins/check_snmp.c:298
 msgid "No valid data returned"
 msgstr "Pas de données valides reçues"
-#: plugins/check_snmp.c:491
+#: plugins/check_snmp.c:496
 msgid "Retries interval must be a positive integer"
 msgstr "L'intervalle pour les essais doit être un entier positif"
-#: plugins/check_snmp.c:554
+#: plugins/check_snmp.c:559
 #, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Impossible de réallouer des labels[%d]"
-#: plugins/check_snmp.c:566
+#: plugins/check_snmp.c:571
 msgid "Could not reallocate labels\n"
 msgstr "Impossible de réallouer des labels\n"
-#: plugins/check_snmp.c:583
+#: plugins/check_snmp.c:588
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
-#: plugins/check_snmp.c:595
+#: plugins/check_snmp.c:600
 msgid "Could not realloc() units\n"
 msgstr "Impossible de réallouer des unités\n"
-#: plugins/check_snmp.c:653
+#: plugins/check_snmp.c:658
 #, fuzzy
 msgid "No host specified\n"
 msgstr "Pas de compteur spécifié"
-#: plugins/check_snmp.c:657
+#: plugins/check_snmp.c:662
 #, fuzzy
 msgid "No OIDs specified\n"
 msgstr "Pas de compteur spécifié"
-#: plugins/check_snmp.c:679
+#: plugins/check_snmp.c:684
 msgid "Invalid seclevel"
 msgstr ""
-#: plugins/check_snmp.c:686 plugins/check_snmp.c:689 plugins/check_snmp.c:707
+#: plugins/check_snmp.c:691 plugins/check_snmp.c:694 plugins/check_snmp.c:712
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
-#: plugins/check_snmp.c:728
+#: plugins/check_snmp.c:733
 msgid "Invalid SNMP version"
 msgstr "Version de SNMP invalide"
-#: plugins/check_snmp.c:745
+#: plugins/check_snmp.c:750
 msgid "Unbalanced quotes\n"
 msgstr "Guillemets manquants\n"
-#: plugins/check_snmp.c:794
+#: plugins/check_snmp.c:799
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
 "Vérifie l'état des machines distantes et obtient l'information système via "
 "SNMP"
-#: plugins/check_snmp.c:807
+#: plugins/check_snmp.c:812
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET"
-#: plugins/check_snmp.c:809
+#: plugins/check_snmp.c:814
 msgid "SNMP protocol version"
 msgstr "Version du protocole SNMP"
-#: plugins/check_snmp.c:811
+#: plugins/check_snmp.c:816
 msgid "SNMPv3 securityLevel"
 msgstr "Niveau de sécurité SNMPv3 (securityLevel)"
-#: plugins/check_snmp.c:813
+#: plugins/check_snmp.c:818
 msgid "SNMPv3 auth proto"
 msgstr "Protocole d'authentification SNMPv3"
-#: plugins/check_snmp.c:815
+#: plugins/check_snmp.c:820
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
-#: plugins/check_snmp.c:819
+#: plugins/check_snmp.c:824
 msgid "Optional community string for SNMP communication"
 msgstr "Communauté optionnelle pour la communication SNMP"
-#: plugins/check_snmp.c:820
+#: plugins/check_snmp.c:825
 msgid "default is"
 msgstr "défaut:"
-#: plugins/check_snmp.c:822
+#: plugins/check_snmp.c:827
 msgid "SNMPv3 username"
 msgstr "Nom d'utilisateur SNMPv3"
-#: plugins/check_snmp.c:824
+#: plugins/check_snmp.c:829
 msgid "SNMPv3 authentication password"
 msgstr "Mot de passe d'authentification SNMPv3"
-#: plugins/check_snmp.c:826
+#: plugins/check_snmp.c:831
 msgid "SNMPv3 privacy password"
 msgstr "Mot de passe de confidentialité SNMPv3"
-#: plugins/check_snmp.c:830
+#: plugins/check_snmp.c:835
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
-#: plugins/check_snmp.c:832
+#: plugins/check_snmp.c:837
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
-#: plugins/check_snmp.c:833
+#: plugins/check_snmp.c:838
 msgid "for symbolic OIDs.)"
 msgstr ""
-#: plugins/check_snmp.c:835
+#: plugins/check_snmp.c:840
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
-#: plugins/check_snmp.c:836
+#: plugins/check_snmp.c:841
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
-#: plugins/check_snmp.c:837
+#: plugins/check_snmp.c:842
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
-#: plugins/check_snmp.c:841
+#: plugins/check_snmp.c:846
 #, fuzzy
 msgid "Warning threshold range(s)"
 msgstr "Valeurs pour le seuil d'avertissement"
-#: plugins/check_snmp.c:843
+#: plugins/check_snmp.c:848
 #, fuzzy
 msgid "Critical threshold range(s)"
 msgstr "Valeurs pour le seuil critique"
-#: plugins/check_snmp.c:847
+#: plugins/check_snmp.c:852
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
-#: plugins/check_snmp.c:849
+#: plugins/check_snmp.c:854
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
-#: plugins/check_snmp.c:851
+#: plugins/check_snmp.c:856
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
-#: plugins/check_snmp.c:853
+#: plugins/check_snmp.c:858
 msgid "Prefix label for output from plugin (default -s 'SNMP')"
 msgstr ""
-#: plugins/check_snmp.c:857
+#: plugins/check_snmp.c:862
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
-#: plugins/check_snmp.c:859
+#: plugins/check_snmp.c:864
 msgid "Separates output on multiple OID requests"
 msgstr ""
-#: plugins/check_snmp.c:863
+#: plugins/check_snmp.c:868
 #, fuzzy
 msgid "Number of retries to be used in the requests"
 msgstr "Le nombre d'essai doit être un entier positif"
-#: plugins/check_snmp.c:868
+#: plugins/check_snmp.c:873
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
-#: plugins/check_snmp.c:869
+#: plugins/check_snmp.c:874
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
 "Si vous n'avez pas le programme installé, vous devrez le télécharger depuis"
-#: plugins/check_snmp.c:870
+#: plugins/check_snmp.c:875
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin."
-#: plugins/check_snmp.c:874
+#: plugins/check_snmp.c:879
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with"
 msgstr ""
 "- Des OIDs multiples peuvent être indiquées par une virgule ou par des listes"
-#: plugins/check_snmp.c:875
+#: plugins/check_snmp.c:880
 msgid "internal spaces must be quoted) [max 8 OIDs]"
 msgstr ""
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:884
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
-#: plugins/check_snmp.c:880
+#: plugins/check_snmp.c:885
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
-#: plugins/check_snmp.c:881
+#: plugins/check_snmp.c:886
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
-#: plugins/check_snmp.c:882
+#: plugins/check_snmp.c:887
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
--- a/po/nagios-plugins.pot
+++ b/po/nagios-plugins.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-17 13:03+0100\n"
+"POT-Creation-Date: 2009-09-16 09:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -62,7 +62,7 @@ msgstr ""
 #: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
 #: plugins/check_http.c:250 plugins/check_ldap.c:292 plugins/check_pgsql.c:250
 #: plugins/check_procs.c:364 plugins/check_radius.c:286
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:476
+#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:481
 #: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
 #: plugins/check_ups.c:556 plugins/negate.c:161
 msgid "Timeout interval must be a positive integer"
@ -210,11 +210,11 @@ msgid ""
 "all of -O, -s, and -n options (servicelist order must match '-C'options)"
 msgstr ""
-#: plugins/check_by_ssh.c:438 plugins/check_dig.c:342 plugins/check_disk.c:969
+#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:265
-#: plugins/check_http.c:1384 plugins/check_nagios.c:308
+#: plugins/check_dig.c:342 plugins/check_disk.c:969 plugins/check_http.c:1384
-#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:663
+#: plugins/check_nagios.c:308 plugins/check_ntp.c:868
-#: plugins/check_ntp_time.c:632 plugins/check_procs.c:748 plugins/negate.c:268
+#: plugins/check_ntp_peer.c:663 plugins/check_ntp_time.c:632
-#: plugins/urlize.c:180
+#: plugins/check_procs.c:748 plugins/negate.c:268 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
@ -229,7 +229,7 @@ msgstr ""
 #: plugins/check_overcr.c:456 plugins/check_pgsql.c:471
 #: plugins/check_ping.c:597 plugins/check_procs.c:743
 #: plugins/check_radius.c:355 plugins/check_real.c:445
-#: plugins/check_smtp.c:813 plugins/check_snmp.c:873 plugins/check_ssh.c:296
+#: plugins/check_smtp.c:813 plugins/check_snmp.c:878 plugins/check_ssh.c:296
 #: plugins/check_swap.c:547 plugins/check_tcp.c:646 plugins/check_time.c:365
 #: plugins/check_ups.c:642 plugins/check_users.c:224
 #: plugins/check_ide_smart.c:511 plugins/negate.c:274
@ -237,7 +237,7 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
-#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:272
+#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:277
 #: plugins/check_dig.c:360 plugins/check_disk.c:986 plugins/check_dns.c:492
 #: plugins/check_dummy.c:122 plugins/check_fping.c:438
 #: plugins/check_game.c:335 plugins/check_hpjd.c:420 plugins/check_http.c:1407
@ -247,7 +247,7 @@ msgstr ""
 #: plugins/check_ntp_time.c:641 plugins/check_nwstat.c:1688
 #: plugins/check_overcr.c:471 plugins/check_pgsql.c:483
 #: plugins/check_ping.c:607 plugins/check_radius.c:367
-#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:895
+#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:900
 #: plugins/check_ssh.c:308 plugins/check_swap.c:563 plugins/check_tcp.c:657
 #: plugins/check_time.c:377 plugins/check_ups.c:664 plugins/check_users.c:235
 #: plugins/check_ide_smart.c:533 plugins/negate.c:292 plugins/urlize.c:197
@ -297,6 +297,12 @@ msgstr ""
 msgid "commas"
 msgstr ""
 #: plugins/check_cluster.c:267
 msgid ""
 "Will alert critical if there are 3 or more service data points in a non-OK "
 "state"
 msgstr ""
 #: plugins/check_dig.c:99 plugins/check_dig.c:101
 #, c-format
 msgid "Looking for: '%s'\n"
@ -3949,7 +3955,7 @@ msgstr ""
 msgid "CRITICAL - Cannot retrieve server certificate."
 msgstr ""
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:533
+#: plugins/check_smtp.c:311 plugins/check_snmp.c:538
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
@ -3959,7 +3965,7 @@ msgstr ""
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:315
+#: plugins/check_smtp.c:324 plugins/check_snmp.c:320
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
@ -4108,204 +4114,204 @@ msgstr ""
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
-#: plugins/check_snmp.c:293
+#: plugins/check_snmp.c:298
 msgid "No valid data returned"
 msgstr ""
-#: plugins/check_snmp.c:491
+#: plugins/check_snmp.c:496
 msgid "Retries interval must be a positive integer"
 msgstr ""
-#: plugins/check_snmp.c:554
+#: plugins/check_snmp.c:559
 #, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr ""
-#: plugins/check_snmp.c:566
+#: plugins/check_snmp.c:571
 msgid "Could not reallocate labels\n"
 msgstr ""
-#: plugins/check_snmp.c:583
+#: plugins/check_snmp.c:588
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr ""
-#: plugins/check_snmp.c:595
+#: plugins/check_snmp.c:600
 msgid "Could not realloc() units\n"
 msgstr ""
-#: plugins/check_snmp.c:653
+#: plugins/check_snmp.c:658
 msgid "No host specified\n"
 msgstr ""
-#: plugins/check_snmp.c:657
+#: plugins/check_snmp.c:662
 msgid "No OIDs specified\n"
 msgstr ""
-#: plugins/check_snmp.c:679
+#: plugins/check_snmp.c:684
 msgid "Invalid seclevel"
 msgstr ""
-#: plugins/check_snmp.c:686 plugins/check_snmp.c:689 plugins/check_snmp.c:707
+#: plugins/check_snmp.c:691 plugins/check_snmp.c:694 plugins/check_snmp.c:712
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
-#: plugins/check_snmp.c:728
+#: plugins/check_snmp.c:733
 msgid "Invalid SNMP version"
 msgstr ""
-#: plugins/check_snmp.c:745
+#: plugins/check_snmp.c:750
 msgid "Unbalanced quotes\n"
 msgstr ""
-#: plugins/check_snmp.c:794
+#: plugins/check_snmp.c:799
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
-#: plugins/check_snmp.c:807
+#: plugins/check_snmp.c:812
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr ""
-#: plugins/check_snmp.c:809
+#: plugins/check_snmp.c:814
 msgid "SNMP protocol version"
 msgstr ""
-#: plugins/check_snmp.c:811
+#: plugins/check_snmp.c:816
 msgid "SNMPv3 securityLevel"
 msgstr ""
-#: plugins/check_snmp.c:813
+#: plugins/check_snmp.c:818
 msgid "SNMPv3 auth proto"
 msgstr ""
-#: plugins/check_snmp.c:815
+#: plugins/check_snmp.c:820
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
-#: plugins/check_snmp.c:819
+#: plugins/check_snmp.c:824
 msgid "Optional community string for SNMP communication"
 msgstr ""
-#: plugins/check_snmp.c:820
+#: plugins/check_snmp.c:825
 msgid "default is"
 msgstr ""
-#: plugins/check_snmp.c:822
+#: plugins/check_snmp.c:827
 msgid "SNMPv3 username"
 msgstr ""
-#: plugins/check_snmp.c:824
+#: plugins/check_snmp.c:829
 msgid "SNMPv3 authentication password"
 msgstr ""
-#: plugins/check_snmp.c:826
+#: plugins/check_snmp.c:831
 msgid "SNMPv3 privacy password"
 msgstr ""
-#: plugins/check_snmp.c:830
+#: plugins/check_snmp.c:835
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
-#: plugins/check_snmp.c:832
+#: plugins/check_snmp.c:837
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
-#: plugins/check_snmp.c:833
+#: plugins/check_snmp.c:838
 msgid "for symbolic OIDs.)"
 msgstr ""
-#: plugins/check_snmp.c:835
+#: plugins/check_snmp.c:840
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
-#: plugins/check_snmp.c:836
+#: plugins/check_snmp.c:841
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
-#: plugins/check_snmp.c:837
+#: plugins/check_snmp.c:842
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
-#: plugins/check_snmp.c:841
+#: plugins/check_snmp.c:846
 msgid "Warning threshold range(s)"
 msgstr ""
-#: plugins/check_snmp.c:843
+#: plugins/check_snmp.c:848
 msgid "Critical threshold range(s)"
 msgstr ""
-#: plugins/check_snmp.c:847
+#: plugins/check_snmp.c:852
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
-#: plugins/check_snmp.c:849
+#: plugins/check_snmp.c:854
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
-#: plugins/check_snmp.c:851
+#: plugins/check_snmp.c:856
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
-#: plugins/check_snmp.c:853
+#: plugins/check_snmp.c:858
 msgid "Prefix label for output from plugin (default -s 'SNMP')"
 msgstr ""
-#: plugins/check_snmp.c:857
+#: plugins/check_snmp.c:862
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
-#: plugins/check_snmp.c:859
+#: plugins/check_snmp.c:864
 msgid "Separates output on multiple OID requests"
 msgstr ""
-#: plugins/check_snmp.c:863
+#: plugins/check_snmp.c:868
 msgid "Number of retries to be used in the requests"
 msgstr ""
-#: plugins/check_snmp.c:868
+#: plugins/check_snmp.c:873
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
-#: plugins/check_snmp.c:869
+#: plugins/check_snmp.c:874
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
-#: plugins/check_snmp.c:870
+#: plugins/check_snmp.c:875
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr ""
-#: plugins/check_snmp.c:874
+#: plugins/check_snmp.c:879
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with"
 msgstr ""
-#: plugins/check_snmp.c:875
+#: plugins/check_snmp.c:880
 msgid "internal spaces must be quoted) [max 8 OIDs]"
 msgstr ""
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:884
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
-#: plugins/check_snmp.c:880
+#: plugins/check_snmp.c:885
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
-#: plugins/check_snmp.c:881
+#: plugins/check_snmp.c:886
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
-#: plugins/check_snmp.c:882
+#: plugins/check_snmp.c:887
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
--- a/2
+++ b/2
@ -1 +1 @@
-trunk-200906171200
+1.4.14
--- a/tap/Makefile.in
+++ b/tap/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -18,13 +18,10 @@
 # SUBDIRS = tests
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@ -125,17 +122,18 @@ am__libtap_la_SOURCES_DIST = tap.c tap.h
@USE_LIBTAP_LOCAL_TRUE@am_libtap_la_OBJECTS = tap.lo
 libtap_la_OBJECTS = $(am_libtap_la_OBJECTS)
@USE_LIBTAP_LOCAL_TRUE@am_libtap_la_rpath =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libtap_la_SOURCES)
 DIST_SOURCES = $(am__libtap_la_SOURCES_DIST)
 am__include_HEADERS_DIST = tap.h
@ -151,12 +149,9 @@ HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 INSTALL = @INSTALL@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@ -211,8 +206,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIBC21 = @GLIBC21@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
@ -493,6 +486,7 @@ HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -523,6 +517,7 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MATHLIBS = @MATHLIBS@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@ -593,8 +588,6 @@ PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
@ -691,11 +684,7 @@ SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WARRANTY = @WARRANTY@
@ -706,13 +695,13 @@ WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -724,6 +713,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 check_tcp_ssl = @check_tcp_ssl@
 datadir = @datadir@
 datarootdir = @datarootdir@
@ -757,8 +747,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
@USE_LIBTAP_LOCAL_TRUE@noinst_LTLIBRARIES = libtap.la
@USE_LIBTAP_LOCAL_TRUE@libtap_la_SOURCES = tap.c tap.h
@ -806,7 +799,7 @@ clean-noinstLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libtap.la: $(libtap_la_OBJECTS) $(libtap_la_DEPENDENCIES) 
-	$(LINK) $(am_libtap_la_rpath) $(libtap_la_LDFLAGS) $(libtap_la_OBJECTS) $(libtap_la_LIBADD) $(LIBS)
+	$(LINK) $(am_libtap_la_rpath) $(libtap_la_OBJECTS) $(libtap_la_LIBADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -817,22 +810,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tap.Plo@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@ -842,13 +835,9 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@ -913,22 +902,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -944,7 +932,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@ -979,7 +967,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 dvi: dvi-am
@ -993,12 +981,20 @@ info-am:
 install-data-am: install-includeHEADERS
 install-dvi: install-dvi-am
 install-exec-am:
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -1019,20 +1015,23 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
+	install install-am install-data install-data-am install-dvi \
-	install-exec-am install-includeHEADERS install-info \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-info-am install-man install-strip installcheck \
+	install-html-am install-includeHEADERS install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
+	tags uninstall uninstall-am uninstall-includeHEADERS
 	uninstall-info-am
 # see top comment