Merge branch 'collectd-4.2'

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 1c604e1..620389f 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -4,13 +4,13 @@ EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL perl/Collectd/Makefile.PL \
 all-local: @PERL_BINDINGS@
 
 install-exec-local:
-       [ ! -f perl/Makefile ] || $(MAKE) -C perl install
+       [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install )
 
 clean-local:
-       [ ! -f perl/Makefile ] || $(MAKE) -C perl realclean
+       [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean )
 
 perl: perl/Makefile
-       $(MAKE) -C perl
+       cd perl && $(MAKE)
 
 perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
        perl/Collectd/Makefile.PL $(top_builddir)/config.status
@@ -19,8 +19,10 @@ perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
 .perl-directory-stamp:
        if test ! -d perl; then \
          mkdir -p perl/Collectd; \
-         cp $(srcdir)/perl/{Collectd.pm,Makefile.PL} perl/; \
-         cp $(srcdir)/perl/Collectd/{Unixsock.pm,Makefile.PL} perl/Collectd/; \
+         cp $(srcdir)/perl/Collectd.pm perl/; \
+         cp $(srcdir)/perl/Makefile.PL perl/; \
+         cp $(srcdir)/perl/Collectd/Unixsock.pm perl/Collectd/; \
+         cp $(srcdir)/perl/Collectd/Makefile.PL perl/Collectd/; \
        fi
        touch $@
 

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 36d50a8..021d193 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -469,6 +469,9 @@ between, thus I<"foo:1234-1234-1234-1234">).
 Sets the log-level. If, for example, set to B<notice>, then all events with
 severity B<notice>, B<warning>, or B<err> will be written to the logfile.
 
+Please note that B<debug> is only available if collectd has been compiled with
+debugging support.
+
 =item B<File> I<File>
 
 Sets the file to write log messages to. The special strings B<stdout> and
@@ -920,6 +923,9 @@ Sets the log-level. If, for example, set to B<notice>, then all events with
 severity B<notice>, B<warning>, or B<err> will be submitted to the
 syslog-daemon.
 
+Please note that B<debug> is only available if collectd has been compiled with
+debugging support.
+
 =back
 
 =head2 Plugin C<tcpconns>

diff --git a/src/configfile.c b/src/configfile.c
index 3baec99..867338d 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/configfile.c
- * Copyright (C) 2005,2006  Florian octo Forster
+ * Copyright (C) 2005-2008  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the