Merge branch 'collectd-4.0'

Conflicts:

	configure.in

diff --cc configure.in
index 97bf973,62ec8b2..9c4be50
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -174,13 -189,42 +174,22 @@@ AC_CHECK_HEADERS(netinet/udp.h, [], []
  ])
  
  # For cpu modules
- AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
++AC_CHECK_HEADERS(sys/dkstat.h mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
+ AC_CHECK_HEADERS(sys/sysctl.h, [], [],
+ [
+ #if HAVE_SYS_TYPES_H
+ #  include <sys/types.h>
+ #endif
+ #if HAVE_SYS_PARAM_H
+ # include <sys/param.h>
+ #endif
+ ])
 -AC_CHECK_HEADERS(sys/dkstat.h)
 -AC_CHECK_HEADERS(mach/mach_init.h)
 -AC_CHECK_HEADERS(mach/host_priv.h)
 -AC_CHECK_HEADERS(mach/mach_error.h)
 -AC_CHECK_HEADERS(mach/mach_host.h)
 -AC_CHECK_HEADERS(mach/mach_port.h)
 -AC_CHECK_HEADERS(mach/mach_types.h)
 -AC_CHECK_HEADERS(mach/message.h)
 -AC_CHECK_HEADERS(mach/processor_set.h)
 -AC_CHECK_HEADERS(mach/processor.h)
 -AC_CHECK_HEADERS(mach/processor_info.h)
 -AC_CHECK_HEADERS(mach/task.h)
 -AC_CHECK_HEADERS(mach/thread_act.h)
 -AC_CHECK_HEADERS(mach/vm_region.h)
 -AC_CHECK_HEADERS(mach/vm_map.h)
 -AC_CHECK_HEADERS(mach/vm_prot.h)
 -AC_CHECK_HEADERS(mach/vm_statistics.h)
 -AC_CHECK_HEADERS(mach/kern_return.h)
  
  # For hddtemp module
 -AC_CHECK_HEADERS(linux/major.h)
 -AC_CHECK_HEADERS(libgen.h)
 +AC_CHECK_HEADERS(linux/major.h libgen.h)
  
  # For the apple_sensors module
 -AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h)
 -AC_CHECK_HEADERS(IOKit/IOKitLib.h)
 -AC_CHECK_HEADERS(IOKit/IOTypes.h)
 +AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h)
  
  # For the battery plugin
  AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [],
@@@ -192,12 -236,32 +201,22 @@@
  #  include <IOKit/IOTypes.h>
  #endif
  ])
 -AC_CHECK_HEADERS(IOKit/ps/IOPSKeys.h)
 -
 -# For the `disk' plugin
 -AC_CHECK_HEADERS(IOKit/IOBSD.h)
 -AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDriver.h)
 -
 -# For load module
 -AC_CHECK_HEADERS(sys/loadavg.h)
 -
 -# For the processes plugin
 -AC_CHECK_HEADERS(linux/config.h)
  
- # For the swap module
+ # For the swap module
+ AC_CHECK_HEADERS(sys/swap.h, [], [],
+ [
+ #if HAVE_SYS_TYPES_H
+ #  include <sys/types.h>
+ #endif
+ #if HAVE_SYS_PARAM_H
+ # include <sys/param.h>
+ #endif
+ ])
+ 
 +# For load module
 +# For the processes plugin
  # For users module
- AC_CHECK_HEADERS(sys/loadavg.h linux/config.h sys/swap.h utmp.h utmpx.h)
 -AC_CHECK_HEADERS(utmp.h)
 -AC_CHECK_HEADERS(utmpx.h)
++AC_CHECK_HEADERS(sys/loadavg.h linux/config.h utmp.h utmpx.h)
  
  # For interface plugin
  AC_CHECK_HEADERS(ifaddrs.h)
@@@ -232,10 -296,76 +251,46 @@@ AC_CHECK_HEADERS(linux/netdevice.h, []
  #endif
  ])
  
--# For apache plugin
 -AC_CHECK_HEADERS(curl/curl.h)
 -
+ # For quota module
 -AC_CHECK_HEADERS(pwd.h)
+ AC_CHECK_HEADERS(sys/ucred.h, [], [],
+ [
+ #if HAVE_SYS_TYPES_H
+ #  include <sys/types.h>
+ #endif
+ #if HAVE_SYS_PARAM_H
+ # include <sys/param.h>
+ #endif
+ ])
 -AC_CHECK_HEADERS(ctype.h)
 -AC_CHECK_HEADERS(limits.h)
 -AC_CHECK_HEADERS(sys/quota.h)
 -AC_CHECK_HEADERS(xfs/xqm.h)
+ 
  # For mount interface
 -AC_CHECK_HEADERS(fs_info.h)
 -AC_CHECK_HEADERS(fshelp.h)
 -AC_CHECK_HEADERS(paths.h)
 -AC_CHECK_HEADERS(mntent.h)
 -AC_CHECK_HEADERS(mnttab.h)
 -AC_CHECK_HEADERS(sys/fstyp.h)
 -AC_CHECK_HEADERS(sys/fs_types.h)
 -AC_CHECK_HEADERS(sys/mntent.h)
 -AC_CHECK_HEADERS(sys/mnttab.h)
+ AC_CHECK_HEADERS(sys/mount.h, [], [],
+ [
+ #if HAVE_SYS_TYPES_H
+ #  include <sys/types.h>
+ #endif
+ #if HAVE_SYS_PARAM_H
+ # include <sys/param.h>
+ #endif
+ ])
 -AC_CHECK_HEADERS(sys/statfs.h)
 -AC_CHECK_HEADERS(sys/statvfs.h)
 -AC_CHECK_HEADERS(sys/vfs.h)
 -AC_CHECK_HEADERS(sys/vfstab.h)
 -
 -# For the swap plugin, FreeBSD
 -AC_CHECK_HEADERS(kvm.h)
+ 
+ # For the email plugin
+ AC_CHECK_HEADERS(linux/un.h, [], [],
+ [
+ #if HAVE_SYS_SOCKET_H
+ #     include <sys/socket.h>
+ #endif
+ ])
 -AC_CHECK_HEADERS(sys/un.h)
 -AC_CHECK_HEADERS(grp.h)
+ 
 -# For debugging interface (variable number of arguments)
 -AC_CHECK_HEADERS(stdarg.h)
 -
 -# Regular expressions for the ignorelist.
 -AC_CHECK_HEADERS(regex.h)
++AC_CHECK_HEADERS(curl/curl.h pwd.h grp.h sys/un.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h)
+ 
  # For the dns plugin
- AC_CHECK_HEADERS(curl/curl.h pwd.h grp.h sys/un.h sys/ucred.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h arpa/nameser.h arpa/nameser_compat.h)
+ AC_CHECK_HEADERS(arpa/nameser.h)
+ AC_CHECK_HEADERS(arpa/nameser_compat.h, [], [],
+ [
+ #if HAVE_ARPA_NAMESER_H
+ # include <arpa/nameser.h>
+ #endif
+ ])
  
  AC_CHECK_HEADERS(net/if_arp.h, [], [],
  [#if HAVE_SYS_SOCKET_H
@@@ -287,8 -418,15 +342,11 @@@ AC_HEADER_TIM
  # Checks for library functions.
  #
  AC_PROG_GCC_TRADITIONAL
 -AC_CHECK_FUNCS(gettimeofday select strdup strtol)
 -AC_CHECK_FUNCS(getaddrinfo getnameinfo)
 -AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen)
 -AC_CHECK_FUNCS(strncasecmp strcasecmp)
 -AC_CHECK_FUNCS(openlog syslog closelog)
 +AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog)
  
+ AC_CHECK_FUNCS(getpwnam_r)
+ AC_CHECK_FUNCS(getgrnam_r)
+ 
  socket_needs_socket="no"
  AC_CHECK_FUNCS(socket, [], AC_CHECK_LIB(socket, socket, [socket_needs_socket="yes"], AC_MSG_ERROR(cannot find socket)))
  AM_CONDITIONAL(BUILD_WITH_LIBSOCKET, test "x$socket_needs_socket" = "xyes")

diff --cc src/hddtemp.c
Simple merge

diff --cc src/mbmon.c
Simple merge

diff --cc src/ntpd.c
Simple merge