From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 6 Sep 2009 10:15:06 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.3~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9d15d1058b93acb7be041934acfe76548539041a;p=collectd.git

Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	configure.in
	src/iptables.c
---

9d15d1058b93acb7be041934acfe76548539041a
diff --cc configure.in
index 3033d4e2,533e398b..3f3012bd
--- a/configure.in
+++ b/configure.in
@@@ -3772,7 -3250,7 +3772,7 @@@ AC_SUBST(LCC_VERSION_STRING
  
  AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
  
- AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
 -AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
++AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
  
  if test "x$with_librrd" = "xyes" \
  	&& test "x$librrd_threadsafe" != "xyes"
diff --cc src/Makefile.am
index aca1af71,c01998e8..42b97f8d
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -358,10 -341,10 +358,10 @@@ pkglib_LTLIBRARIES += iptables.l
  iptables_la_SOURCES = iptables.c
  iptables_la_LDFLAGS = -module -avoid-version
  if BUILD_WITH_OWN_LIBIPTC
- iptables_la_LIBADD  = libiptc/libiptc.la
- iptables_la_DEPENDENCIES = libiptc/libiptc.la
+ iptables_la_LIBADD  = owniptc/libiptc.la
+ iptables_la_DEPENDENCIES = owniptc/libiptc.la
  else
 -iptables_la_LDFLAGS += -liptc
 +iptables_la_LIBADD = -liptc
  endif
  collectd_LDADD += "-dlopen" iptables.la
  collectd_DEPENDENCIES += iptables.la
diff --cc src/iptables.c
index 6f1030fb,9f56d590..534a8c2a
--- a/src/iptables.c
+++ b/src/iptables.c
@@@ -29,14 -27,10 +29,14 @@@
  #include "plugin.h"
  #include "configfile.h"
  
 +#include <sys/socket.h>
 +
  #if OWN_LIBIPTC
- # include "libiptc/libiptc.h"
- # include "libiptc/libip6tc.h"
+ # include "owniptc/libiptc.h"
++# include "owniptc/libip6tc.h"
  #else
  # include <libiptc/libiptc.h>
 +# include <libiptc/libip6tc.h>
  #endif
  
  /*