From 78eb2279d65f24d28e71f06200f4baa074284a23 Mon Sep 17 00:00:00 2001 From: octo Date: Fri, 16 Dec 2005 14:37:52 +0000 Subject: [PATCH] Merged revision 326 to tags/collectd-3.5.0 and the branches --- ChangeLog | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2194ed80..f6a591f3 100644 --- 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 1d246a91..4f21f1c1 100644 --- 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"' -- 2.11.0