Merge branch 'ff/types' into collectd-4

diff --git a/configure.in b/configure.in
index 01c6d73..e4d3d67 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -208,6 +208,7 @@ AC_CHECK_HEADERS(mach/kern_return.h)
 
 # For hddtemp module
 AC_CHECK_HEADERS(linux/major.h)
+AC_CHECK_HEADERS(libgen.h)
 
 # For the apple_sensors module
 AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h)

diff --git a/contrib/iptables/accounting.sh b/contrib/iptables/accounting.sh
index 71032f0..a9a3be9 100755 (executable)
--- a/contrib/iptables/accounting.sh
+++ b/contrib/iptables/accounting.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 #Simple script that sets up some chains in mangle table to do global logging of all 
 #traffic going in and out of an interface
 #Could also use the regular input/output tree but this also catches the forwarded nat traffic

diff --git a/src/liboconfig/Makefile.am b/src/liboconfig/Makefile.am
index c2fd117..c3de92c 100644 (file)
--- a/src/liboconfig/Makefile.am
+++ b/src/liboconfig/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
 BUILT_SOURCES = parser.h
-CLEANFILES = parser.[ch] scanner.c
+#CLEANFILES = parser.[ch] scanner.c
 AM_YFLAGS = -d
 
 noinst_LTLIBRARIES = liboconfig.la

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 7395bcd..52557c0 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/rrdtool.c
- * Copyright (C) 2006  Florian octo Forster
+ * Copyright (C) 2006,2007  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