Merge branch 'master' into collectd-4

Conflicts:

	src/multimeter.c
	src/network.c
	src/utils_debug.c

diff --git a/configure.in b/configure.in
index d2c4aa2..4e34555 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,8 @@ AC_LANG(C)
 
 AC_PREFIX_DEFAULT("/opt/collectd")
 
+AC_SYS_LARGEFILE
+
 #
 # Checks for programs.
 #

diff --git a/src/collectd.h b/src/collectd.h
index 3d44c51..ac75516 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -23,7 +23,7 @@
 #define COLLECTD_H
 
 #if HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include <stdio.h>

diff --git a/src/common.c b/src/common.c
index 6521a58..bcdf59a 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -20,6 +20,10 @@
  *   Niki W. Waibel <niki.waibel@gmx.net>
 **/
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "common.h"
 #include "plugin.h"
 

diff --git a/src/utils_ignorelist.c b/src/utils_ignorelist.c
index f71ac1d..d2546aa 100644 (file)
--- a/src/utils_ignorelist.c
+++ b/src/utils_ignorelist.c
@@ -47,6 +47,10 @@
  *     return;
  **/
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"

diff --git a/src/utils_mount.c b/src/utils_mount.c
index eee2eb6..67d2e33 100644 (file)
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -21,7 +21,9 @@
  *   Niki W. Waibel <niki.waibel@gmx.net>
 **/
 
-
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "common.h"
 #if HAVE_XFS_XQM_H