From: octo <octo>
Date: Fri, 16 Dec 2005 14:37:52 +0000 (+0000)
Subject: Merged revision 326 to tags/collectd-3.5.0 and the branches
X-Git-Tag: collectd-3.5.0^0
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2e7b862af2ccf01ecc1f8a338b61bf7a84d0a910;p=collectd.git

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

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 c15e91ee..6b94389c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ collectd_SOURCES = collectd.c collectd.h \
 		   multicast.c multicast.h \
 		   plugin.c plugin.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"'
diff --git a/src/collectd.c b/src/collectd.c
index 418a5d74..069fb1ec 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -144,7 +144,7 @@ void exit_usage (char *name)
 			"\n%s %s, http://verplant.org/collectd/\n"
 			"by Florian octo Forster <octo@verplant.org>\n"
 			"for contributions see `AUTHORS'\n",
-			PACKAGE, CONFIGFILE, PIDFILE, PLUGINDIR, PKGLOCALSTATEDIR, PACKAGE, VERSION);
+			PACKAGE, /* CONFIGFILE, */ PIDFILE, PLUGINDIR, PKGLOCALSTATEDIR, PACKAGE, VERSION);
 	exit (0);
 }