Merge branch 'collectd-3.11'

Conflicts:

	ChangeLog

diff --combined ChangeLog
index 5fac3d6,e704b25..dbd6eca
--- 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 --combined configure.in
index 4f8bb09,0f6d3c0..2252e39
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  dnl Process this file with autoconf to produce a configure script.
- AC_INIT(collectd, 3.11.3)
+ AC_INIT(collectd, 3.11.4)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)
@@@ -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)
  
  #
@@@ -926,45 -944,6 +946,45 @@@ AC_DEFINE_UNQUOTED(COLLECT_LIBPCAP, [$c
        [Wether or not to use the pcap library])
  AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
  
 +AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
 +[
 +      if test "x$withval" != "xno" && test "x$withval" != "xyes"
 +      then
 +              LDFLAGS="$LDFLAGS -L$withval/lib"
 +              CPPFLAGS="$CPPFLAGS -I$withval/include"
 +              with_libiptc="yes"
 +      fi
 +],
 +[
 +      if test "x$ac_system" = "xLinux"
 +      then
 +              with_libiptc="yes"
 +      else
 +              with_libiptc="no (Linux only)"
 +      fi
 +])
 +if test "x$with_libiptc" = "xyes"
 +then
 +      AC_CHECK_LIB(iptc, iptc_init,
 +      [
 +              AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
 +      ], [with_libiptc="no (libiptc not found)"])
 +fi
 +if test "x$with_libiptc" = "xyes"
 +then
 +      AC_CHECK_HEADERS(libiptc/libiptc.h,
 +      [
 +              AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
 +      ], [with_libiptc="no (libiptc/libiptc.h not found)"])
 +fi
 +if test "x$with_libiptc" = "xyes"
 +then
 +      collect_libiptc=1
 +else
 +      collect_libiptc=0
 +fi
 +AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 +
  # Define `step' and `hearbeat' values..
  declare -i collectd_step=10
  declare -i collectd_heartbeat=25
@@@ -1084,15 -1063,13 +1104,15 @@@ AC_COLLECTD([dns],       [disable], [mo
  AC_COLLECTD([email],     [disable], [module], [email statistics])
  AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
  AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
 +AC_COLLECTD([iptables],  [disable], [module], [IPtables statistics])
 +AC_COLLECTD([irq],       [disable], [module], [irq statistics])
  AC_COLLECTD([load],      [disable], [module], [system load statistics])
  AC_COLLECTD([mbmon],     [disable], [module], [motherboard monitor statistics])
  AC_COLLECTD([memory],    [disable], [module], [memory statistics])
  AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics])
  AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
  AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
 -AC_COLLECTD([ntpd],      [disable], [module], [nfs statistics])
 +AC_COLLECTD([ntpd],      [disable], [module], [ntpd statistics])
  AC_COLLECTD([ping],      [disable], [module], [ping statistics])
  AC_COLLECTD([processes], [disable], [module], [processes statistics])
  AC_COLLECTD([sensors],   [disable], [module], [lm_sensors statistics])
@@@ -1119,7 -1096,6 +1139,7 @@@ Configuration
      libkstat  . . . . . $with_kstat
      libmysql  . . . . . $with_libmysql
      libpcap . . . . . . $with_libpcap
 +    libiptc . . . . . . $with_libiptc
      libpthread  . . . . $with_libpthread
  
    Features:
@@@ -1140,8 -1116,6 +1160,8 @@@
      dns . . . . . . . . $enable_dns
      email . . . . . . . $enable_email
      hddtemp . . . . . . $enable_hddtemp
 +    irq . . . . . . . . $enable_irq
 +    iptables  . . . . . $enable_iptables
      load  . . . . . . . $enable_load
      mbmon . . . . . . . $enable_mbmon
      memory  . . . . . . $enable_memory