Merge branch 'collectd-3.11'

diff --git a/configure.in b/configure.in
index 2252e39..8bfd66e 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 a5c8169..61edcd5 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -24,7 +24,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 5487b32..fd1fbd4 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -22,6 +22,10 @@
  *   Niki W. Waibel <niki.waibel@gmx.net>
 **/
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "common.h"
 #include "utils_debug.h"
 

diff --git a/src/multimeter.c b/src/multimeter.c
index 46438bf..09073ab 100644 (file)
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -23,13 +23,14 @@
  *
  **/
 
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <math.h>
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
 
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <math.h>
+
 #define MODULE_NAME "multimeter"
 
 static char *multimeter_file = "multimeter.rrd";

diff --git a/src/network.c b/src/network.c
index e9ba84b..32af404 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -20,6 +20,10 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/utils_debug.c b/src/utils_debug.c
index 9fc9040..8bfe10b 100644 (file)
--- a/src/utils_debug.c
+++ b/src/utils_debug.c
@@ -20,6 +20,10 @@
  *   Niki W. Waibel <niki.waibel at gmx.net>
  **/
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "common.h"
 #include "utils_debug.h"
 

diff --git a/src/utils_ignorelist.c b/src/utils_ignorelist.c
index 532eb4b..d002c7a 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 "utils_debug.h"
 #include "utils_ignorelist.h"

diff --git a/src/utils_mount.c b/src/utils_mount.c
index 7748c61..163bd63 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