Merge branch 'collectd-4.1'

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 252d16f..44d7cfc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1259,7 +1259,7 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@],
                with_libupsclient="no"
        else
                with_libupsclient="yes"
-               if "x$withval" != "xyes"
+               if test "x$withval" != "xyes"
                then
                        if test -x "$withval"
                        then
@@ -1434,9 +1434,47 @@ then
        ], [],
 [#include <stdio.h>
 #include <sys/types.h>
+#include <asm/types.h>
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>])
+       AC_CHECK_HEADERS(linux/gen_stats.h linux/pkt_sched.h, [], [],
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>])
+
+       AC_COMPILE_IFELSE(
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+int main (void)
+{
+       int retval = TCA_STATS2;
+       return (retval);
+}],
+       [AC_DEFINE([HAVE_TCA_STATS2], 1, [True if the enum-member TCA_STATS2 exists])]
+       []);
+
+       AC_COMPILE_IFELSE(
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+int main (void)
+{
+       int retval = TCA_STATS;
+       return (retval);
+}],
+       [AC_DEFINE([HAVE_TCA_STATS], 1, [True if the enum-member TCA_STATS exists])]
+       []);
 
        CFLAGS="$SAVE_CFLAGS"
 fi