rrdtool plugin: Include the `rrd.h' header file in `rrdtool.c', not `collectd.h'.

This caused an error when --with-rrdtool was used to have the header file in a
non-standard directory, because the appropriate CFLAGS were not passed to all
plugins.

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 9fc687285cab7ae9894f3285d086a5f810d52b7f..368858172a92dfee9fb52d56eebb3e86e5c2ab57 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