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 c15e91eeabe4a3c62a3996c3bf490c229c681fa6..6b94389c91faf690ddc12c579aefd3c92ffd7541 100644 (file)
--- 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 418a5d7433ecd789115227342907fed1eec3029d..069fb1ecad2bb03b6800fa288712913bc2187d30 100644 (file)
--- 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);
 }