summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 856044b)
raw | patch | inline | side by side (parent: 856044b)
author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Thu, 5 Apr 2007 17:56:42 +0000 (19:56 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Thu, 5 Apr 2007 17:56:42 +0000 (19:56 +0200) |
configure.in | patch | blob | history | |
src/Makefile.am | patch | blob | history | |
src/collectd.c | patch | blob | history | |
src/configfile.c | patch | blob | history |
diff --git a/configure.in b/configure.in
index a7762568286e2d9cbfb428b217a5bf816194f2e0..dad499a9ddec0e9aa185a04ebbb9c17faa21b969 100644 (file)
--- a/configure.in
+++ b/configure.in
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 4.0.0-rc1)
+AC_INIT(collectd, 4.0.0-rc2)
AC_CONFIG_SRCDIR(src/collectd.c)
AC_CONFIG_HEADERS(src/config.h)
AM_INIT_AUTOMAKE(dist-bzip2)
diff --git a/src/Makefile.am b/src/Makefile.am
index 662b49dbf300b767e4e392fbcf39900ce2727828..32bef648842279d049a14b26123c648074204adb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
if BUILD_MODULE_NETWORK
pkglib_LTLIBRARIES += network.la
-network_la_SOURCES = network.c
+network_la_SOURCES = network.c network.h
network_la_LDFLAGS = -module -avoid-version
if BUILD_WITH_LIBSOCKET
network_la_LDFLAGS += -lsocket
diff --git a/src/collectd.c b/src/collectd.c
index f8f2fcc5b1b05c4032c0f6866436f98a4931716a..0986e403221a480ba64632e0624e6239cd522a60 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
#include "collectd.h"
#include "common.h"
-#include "network.h"
#include "plugin.h"
#include "configfile.h"
diff --git a/src/configfile.c b/src/configfile.c
index 311ebb385f0c7602af02b5102f1cd0ce8126e17e..c63240e7005a95f9bff775852a7510568293eb60 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
#include "common.h"
#include "plugin.h"
#include "configfile.h"
-#include "network.h"
#define ESCAPE_NULL(str) ((str) == NULL ? "(null)" : (str))