Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index 407c57c7459243442b896ebfe1982201b359865f,2cbac4a619ee2824d2905abc145a2a66cbb86a66..5508405723cf05f531ee9e92a2928b455220e046
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,64 -1,15 +1,76 @@@
 +2008-03-29, Version 4.3.2
 +      * collectd: Fix configuration of the `FailureMax', `WarningMax', and
 +        `Persist' threshold options.
 +      * collectd: Fix handling of missing values in the global value cache.
 +      * collectd: Improved error messages when parsing the configuration.
 +      * sensors plugin: Fix temperature collection with libsensors4.
 +      * unixsock plugin: Fix mixed input and output operation on streams.
 +      * wireless plugin: Fix reading noise value.
 +
 +2008-03-05, Version 4.3.1
 +      * exec plugin: Set supplementary group IDs.
 +      * network plugin:
 +        + Use `memcpy' when constructing/parsing a package to avoid
 +          alignment problems on weird architectures, such as Sparc.
 +        + Translate doubles to/from the x86 byte representation to ensure
 +          cross-platform compatibility.
 +      * ping plugin: Correct the handling of the `TTL' setting.
 +      * swap plugin: Reapply a patch for Solaris.
 +      * tcpconns plugin: Portability improvements.
 +
 +2008-02-18, Version 4.3.0
 +      * collectd: Notifications have been added to the daemon. Notifications
 +        are status messages that may be associated with a data instance.
 +      * collectd: Threshold checking has been added to the daemon. This
 +        means that you can configure threshold values for each data
 +        instance. If this threshold is exceeded a notification will be
 +        created.
 +      * collectd: The new `FQDNLookup' option tells the daemon to use the
 +        full qualified domain name as the hostname, not just the host part
 +        es returned by `gethostname(2)'.
 +      * collectd: Support for more than one `TypesDB' file has been added.
 +        This is useful when one such file is included in a package but one
 +        wants to add custom type definitions.
 +      * collectd: The `Include' config option has been expanded to handle
 +        entire directories and shell wildcards.
 +      * collectdmon: The new `collectdmon' binary detects when collectd
 +        terminates and automatically restarts it again.
 +      * csv plugin: The CSV plugin is now able to store counter values as a
 +        rate, using the `StoreRates' configuration option.
 +      * exec plugin: Handling of notifications has been added and the
 +        ability to pass arguments to the executed programs has been added.
 +      * hddtemp plugin: The new `TranslateDevicename' option lets you
 +        disable the translation from device names to major-minor-numbers.
 +      * logfile plugin: Handling of notifications has been added.
 +      * ntpd plugin: The new `ReverseLookups' can be used to disable reverse
 +        domain name lookups in this plugin.
 +      * perl plugin: Many internal changes added support for handling multiple
 +        threads making the plugin reasonably usable inside collectd. The API has
 +        been extended to support notifications and export global variables to
 +        Perl plugins; callbacks now have to be identified by name rather than a
 +        pointer to a subroutine. The plugin is no longer experimental.
 +      * uuid plugin: The new UUID plugin sets the hostname to an unique
 +        identifier for this host. This is meant for setups where each client
 +        may migrate to another physical host, possibly going through one or
 +        more name changes in the process. Thanks to Richard Jones from
 +        Red Hat's Emerging Technology group for this plugin.
 +      * libvirt: The new libvirt plugin uses the `libvirt' library to query
 +        CPU, disk and network statistics about guest systems on the same
 +        physical server. Thanks to Richard Jones from Red Hat's Emerging
 +        Technology group for this plugin.
 +
+ 2008-04-22, Version 4.2.7
+       * build system: Improved detection of several libraries, especially if
+         they are in non-standard paths.
+       * collectd: Error and warning messages have been improved.
+       * collectd: Check for the BYTE_ORDER and BIG_ENDIAN defines before
+         using them.
+       * apache plugin: Allocate new memory when reading a webpage instead of
+         using a buffer of static size.
+       * exec plugin: Close (almost) all filedescriptors before exec(2)ing
+         the program.
+       * hddtemp plugin: Error and warning messages have been improved.
+ 
  2008-03-29, Version 4.2.6
        * collectd: Improved error messages when parsing the configuration.
        * sensors plugin: Fix temperature collection with libsensors4.

diff --cc configure.in
index 036f0a5b20375092953dd36a508e96d0951d9ef1,046b174fdbcba65f95ff19c1d7f54a148d6848d9..cd2110f70db68804e6c57b0238e38ace6d2e2959
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1478,44 -1463,12 +1488,47 @@@ the
  
    CFLAGS=$SAVE_CFLAGS
    LDFLAGS=$SAVE_LDFLAGS
- fi
+ else if test -z "$perl_interpreter"; then
+   with_libperl="no (no perl interpreter found)"
+   have_libperl="no"
+ fi; fi
  AM_CONDITIONAL(BUILD_WITH_LIBPERL, test "x$with_libperl" = "xyes")
  
 +if test "x$with_libperl" = "xyes"
 +then
 +      SAVE_CFLAGS=$CFLAGS
 +      SAVE_LDFLAGS=$LDFLAGS
 +      CFLAGS="$CFLAGS $PERL_CFLAGS"
 +      LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 +
 +      AC_CACHE_CHECK([if perl supports ithreads],
 +              [have_perl_ithreads],
 +              AC_LINK_IFELSE(
 +                      AC_LANG_PROGRAM(
 +                      [[
 +#include <EXTERN.h>
 +#include <perl.h>
 +#include <XSUB.h>
 +
 +#if !defined(USE_ITHREADS)
 +# error "Perl does not support ithreads!"
 +#endif /* !defined(USE_ITHREADS) */
 +                      ]],
 +                      [[ ]]),
 +                      [have_perl_ithreads="yes"],
 +                      [have_perl_ithreads="no"]
 +              )
 +      )
 +
 +      if test "x$have_perl_ithreads" = "xyes"
 +      then
 +              AC_DEFINE(HAVE_PERL_ITHREADS, 1, [Define if Perl supports ithreads.])
 +      fi
 +
 +      CFLAGS=$SAVE_CFLAGS
 +      LDFLAGS=$SAVE_LDFLAGS
 +fi
 +
  AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
  [
        if test "x$withval" != "xno" && test "x$withval" != "xyes"

diff --cc contrib/migrate-3-4.px
Simple merge