From: Florian Forster <octo@collectd.org>
Date: Sun, 18 Mar 2012 08:14:54 +0000 (+0100)
Subject: tcpconns plugin: Include <bsd/nlist.h> rather than <nlist.h>.
X-Git-Tag: collectd-4.10.7~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=cb2155af369ed84a6badba6d3ebab3e5ae37c245;p=collectd.git

tcpconns plugin: Include <bsd/nlist.h> rather than <nlist.h>.

It appears that <nlist.h> is being deprecated / moved.
This hopefully fixes Debian bug #664429.
---

diff --git a/configure.in b/configure.in
index 02a6361b..1dc23bf2 100644
--- a/configure.in
+++ b/configure.in
@@ -1234,6 +1234,7 @@ AM_CONDITIONAL(BUILD_WITH_LIBKVM_GETSWAPINFO, test "x$with_kvm_getswapinfo" = "x
 AC_CHECK_LIB(kvm, kvm_nlist, [with_kvm_nlist="yes"], [with_kvm_nlist="no"])
 if test "x$with_kvm_nlist" = "xyes"
 then
+	AC_CHECK_HEADERS(bsd/nlist.h nlist.h)
 	AC_DEFINE(HAVE_LIBKVM_NLIST, 1,
 		  [Define to 1 if you have the 'kvm' library with the 'kvm_nlist' symbol (-lkvm)])
 	with_libkvm="yes"
diff --git a/src/tcpconns.c b/src/tcpconns.c
index d68cd096..78c337b7 100644
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -116,7 +116,11 @@
 # include <netinet/tcp_var.h>
 # include <netdb.h>
 # include <arpa/inet.h>
-# include <nlist.h>
+# if !defined(HAVE_BSD_NLIST_H) || !HAVE_BSD_NLIST_H
+#  include <nlist.h>
+# else /* HAVE_BSD_NLIST_H */
+#  include <bsd/nlist.h>
+# endif
 # include <kvm.h>
 #endif /* HAVE_LIBKVM_NLIST */