From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 4 Sep 2007 08:32:13 +0000 (+0200)
Subject: netlink plugin: Use the defines to determine where the `libnetlink.h' is.
X-Git-Tag: collectd-4.1.1~5^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4288440742e51d2e2d05243cf2d23b7c9e1e6fd2;p=collectd.git

netlink plugin: Use the defines to determine where the `libnetlink.h' is.
---

diff --git a/src/netlink.c b/src/netlink.c
index 6f9f593c..3cd91d8a 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -25,12 +25,17 @@
 
 #include <asm/types.h>
 #include <sys/socket.h>
-#include <iproute/libnetlink.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/gen_stats.h>
 
-#include <iproute/ll_map.h>
+#if HAVE_LIBNETLINK_H
+# include <libnetlink.h>
+#elif HAVE_IPROUTE_LIBNETLINK_H
+# include <iproute/libnetlink.h>
+#elif HAVE_LINUX_LIBNETLINK_H
+# include <linux/libnetlink.h>
+#endif
 
 typedef struct ir_ignorelist_s
 {
@@ -509,12 +514,6 @@ static int ir_init (void)
     return (-1);
   }
 
-  if (ll_init_map (&rth) != 0)
-  {
-    ERROR ("netlink plugin: ir_read: ll_init_map failed.");
-    return (-1);
-  }
-
   return (0);
 } /* int ir_init */