Merge branch 'collectd-3.11'

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5fac3d6..dbd6eca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +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 --git a/configure.in b/configure.in
index 4f8bb09..2252e39 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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,9 +305,29 @@ 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
+])
 
 #
 # Checking for libraries

diff --git a/debian/changelog b/debian/changelog
index fead672..8d04e16 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.11.4-0octo1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Florian Forster <octo@leeloo.home.verplant.org>  Tue, 10 Apr 2007 17:18:11 +0200
+
 collectd (3.11.3-0octo1) unstable; urgency=low
 
   * New upstream release.

diff --git a/src/utils_dns.c b/src/utils_dns.c
index 6541b89..0943727 100644 (file)
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -41,12 +41,12 @@
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#if HAVE_PCAP_H
-# include <pcap.h>
-#endif
 #if HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 
 #if HAVE_ARPA_NAMESER_H
 # include <arpa/nameser.h>
@@ -67,9 +67,6 @@
 # include <net/if_ppp.h>
 #endif
 
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
@@ -87,6 +84,10 @@
 # include <netinet/udp.h>
 #endif
 
+#if HAVE_PCAP_H
+# include <pcap.h>
+#endif
+
 #define PCAP_SNAPLEN 1460
 #ifndef ETHER_HDR_LEN
 #define ETHER_ADDR_LEN 6