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 02a6361b6d0140b9173291f97564291b02182981..1dc23bf24bbe12a0b907c4932c5b6888f7130178 100644 (file)
--- 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 d68cd0968ca70a126dfd37d839f41ebe0be2fe77..78c337b7687ee3e7fcc3af4ee06e437513444b04 100644 (file)
--- 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 */