Merge branch 'collectd-3.11'

Conflicts:

	ChangeLog

diff --cc ChangeLog
index 5fac3d655d70b510d96c5da39e646315cbe4f010,e704b25496e44ac39b2312e5ce5c98409ea45e13..dbd6eca03d13c91d5ccf26d10fe324673436e71e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +      * apache plugin: Support for lighttpd's `BusyServers' (aka.
 +      connections) field was added by Florent Monbillard.
 +
+ 2007-04-10, Version 3.11.4
+       * dns plugin: Change the order of includes to make the plugin compile
+         under FreeBSD.
+ 
  2007-03-30, Version 3.11.3
        * configure: Have the configure-script define `HAVE_LIBKSTAT' instead
          of the unused `COLLECT_KSTAT'.

diff --cc configure.in
index 4f8bb09893d02dc2b2cdcd7a9bcb54541fde781d,0f6d3c092174cb5a320f80602e93c7c6d7f833f2..2252e39337544165d876e94b431bbea8a6556181
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -305,13 -305,31 +305,33 @@@ AC_CHECK_HEADERS(regex.h
  # For the dns plugin
  AC_CHECK_HEADERS(arpa/nameser.h arpa/nameser_compat.h)
  
- AC_CHECK_HEADERS(net/if_arp.h)
+ AC_CHECK_HEADERS(net/if_arp.h, [], [],
+ [#if HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+ ])
  AC_CHECK_HEADERS(net/if_ppp.h)
- AC_CHECK_HEADERS(netinet/if_ether.h)
+ AC_CHECK_HEADERS(netinet/if_ether.h, [], [],
+ [#if HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+ #if HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
+ #if HAVE_NETINET_IN_H
+ # include <netinet/in.h>
+ #endif
+ ])
  
 -dnl Checking for libraries
 +#
 +# Checking for libraries
 +#
  AC_CHECK_LIB(m, ext)
  
  #