From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 15 May 2007 17:27:31 +0000 (+0200)
Subject: Merge branch 'master' into collectd-4
X-Git-Tag: collectd-4.0.0~42^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=44e4d530c8db2e078cd73ab254d1be41a5f2812c;hp=42c56b58e385b7a45ab0d2287a4042e53ae22c07;p=collectd.git

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 d2c4aa2b..4e345559 100644
--- 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 3d44c515..ac755161 100644
--- 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 6521a58b..bcdf59aa 100644
--- 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 f71ac1d7..d2546aab 100644
--- 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 eee2eb6c..67d2e338 100644
--- 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