Merged revision 326 to tags/collectd-3.5.0 and the branches

diff --git a/ChangeLog b/ChangeLog
index 2194ed80a9dbae6aabeca09b0c63ef0a8df4a362..f6a591f34b45f48ee3767ccd93c18fefb3bcc849 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2005-12-07, Version 3.5.0 (Revision 321)
+2005-12-07, Version 3.5.0 (Revision 326)
        * A bug in the `load' module under Solaris has been fixed.
        * The `users' module has been contributed by Sebastian Harl. It counts
          currently logged in users.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d246a915a95f53c330da411f1d8701914029a06..4f21f1c178dfbc9dca8b204d51de26614fbd914e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ collectd_SOURCES = collectd.c collectd.h \
                   plugin.c plugin.h \
                   configfile.c configfile.h
 #collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
-collectd_CPPFLAGS =
+collectd_CPPFLAGS = $(LTDLINCL)
 collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
 collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
 collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'