From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 10 Apr 2007 15:21:49 +0000 (+0200)
Subject: Merge branch 'collectd-3.11'
X-Git-Tag: collectd-4.0.0-rc4~3^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf;p=collectd.git

Merge branch 'collectd-3.11'

Conflicts:

	ChangeLog
---

bb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf
diff --cc ChangeLog
index 5fac3d65,e704b254..dbd6eca0
--- a/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 4f8bb098,0f6d3c09..2252e393
--- a/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)
  
  #