Merge branch 'collectd-4.1'

diff --git a/configure.in b/configure.in
index 46b9f8f03d82d5051ece67d0fcfaf305fd82c031..4fb42420bd4451c814f8f08310446695e2130a7b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -692,19 +692,25 @@ AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to r
 ], [with_rrdtool="yes"])
 if test "x$with_rrdtool" = "xyes"
 then
-       SAVE_CFLAGS="$CFLAGS"
+       SAVE_CPPFLAGS="$CPPFLAGS"
        SAVE_LDFLAGS="$LDFLAGS"
 
-       CFLAGS="$CFLAGS $librrd_cflags"
+       CPPFLAGS="$CPPFLAGS $librrd_cflags"
        LDFLAGS="$LDFLAGS $librrd_ldflags"
 
        AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no (rrd.h not found)"])
 
-       CFLAGS="$SAVE_CFLAGS"
+       CPPFLAGS="$SAVE_CPPFLAGS"
        LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_rrdtool" = "xyes"
 then
+       SAVE_CPPFLAGS="$CPPFLAGS"
+       SAVE_LDFLAGS="$LDFLAGS"
+
+       CPPFLAGS="$CPPFLAGS $librrd_cflags"
+       LDFLAGS="$LDFLAGS $librrd_ldflags"
+
        AC_CHECK_LIB(rrd_th, rrd_update_r,
        [with_rrdtool="yes"
         librrd_ldflags="$librrd_ldflags -lrrd_th -lm"
@@ -718,6 +724,9 @@ then
         [-lm])
        ]
        [-lm])
+
+       CPPFLAGS="$SAVE_CPPFLAGS"
+       LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_rrdtool" = "xyes"
 then

diff --git a/src/collectd.h b/src/collectd.h
index 282e632520ce08cb1a755588c251a10f53aa4e24..2849db27234002a6cae6f4b3bb193f2db657b0e6 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -153,9 +153,6 @@
 # include <kstat.h>
 #endif
 
-#if HAVE_RRD_H
-# include <rrd.h>
-#endif
 #if HAVE_PTH_H
 # include <pth.h>
 #endif

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 0dae46b3fe7b4eb5d46e097b16ca5055cb9bbaaf..e356bf19d6d91fb4a275fffb840df0c6f3827a4b 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -24,6 +24,8 @@
 #include "common.h"
 #include "utils_avltree.h"
 
+#include <rrd.h>
+
 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #endif

diff --git a/src/types.db b/src/types.db
index 865335f40c606117e5e1dc9f2e6fae2b216e9bd1..efaea0ecd7163658ed1b4656fe81bcd063405cae 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -59,7 +59,7 @@ percent                       percent:GAUGE:0:100.1
 ping                   ping:GAUGE:0:65535
 power                  value:GAUGE:0:U
 ps_count               processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
-ps_cputime             user:COUNTER:0:1000000, syst:COUNTER:0:1000000
+ps_cputime             user:COUNTER:0:16000000, syst:COUNTER:0:16000000
 ps_pagefaults          minflt:COUNTER:0:9223372036854775807, majflt:COUNTER:0:9223372036854775807
 ps_rss                 value:GAUGE:0:9223372036854775807
 ps_state               value:GAUGE:0:65535