From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 4 Sep 2007 21:46:12 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a35017c70b0fc1a3531a0b630071dedbbaa9372;p=collectd.git

Merge branch 'pull/collectd-4.1' into collectd-4.1
---

8a35017c70b0fc1a3531a0b630071dedbbaa9372
diff --cc configure.in
index 8544ca46,252d16ff..68299545
--- a/configure.in
+++ b/configure.in
@@@ -1431,10 -1425,15 +1425,16 @@@ the
  	SAVE_CFLAGS=$CFLAGS
  	CFLAGS="$CFLAGS $with_libnetlink_cflags"
  
- 	AC_CHECK_HEADERS(iproute/libnetlink.h, [], [with_libnetlink="no (iproute/libnetlink.h not found)"],
+ 	with_libnetlink="no (libnetlink.h not found)"
+ 
+ 	AC_CHECK_HEADERS(libnetlink.h iproute/libnetlink.h linux/libnetlink.h,
+ 	[
+ 	 with_libnetlink="yes"
+ 	 break
+ 	], [],
  [#include <stdio.h>
  #include <sys/types.h>
 +#include <asm/types.h>
  #include <sys/socket.h>
  #include <linux/netlink.h>
  #include <linux/rtnetlink.h>])