From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 8 Nov 2008 08:00:00 +0000 (+0100)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~163
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=576d966de9a98aacd1a2740abb349022cc32d913;p=collectd.git

Merge branch 'collectd-4.5'
---

576d966de9a98aacd1a2740abb349022cc32d913
diff --cc src/libiptc/Makefile.am
index 3a6ef675,ffa98878..a8ed93cc
--- a/src/libiptc/Makefile.am
+++ b/src/libiptc/Makefile.am
@@@ -8,7 -8,8 +8,8 @@@ endi
  
  noinst_LTLIBRARIES = libiptc.la
  
 -libiptc_la_CFLAGS = -DIPTABLES_VERSION=\"1.4.0\" -I$(KERNEL_DIR)/include
 +libiptc_la_CFLAGS = -I$(KERNEL_DIR)/include
  libiptc_la_SOURCES = libip4tc.c libip6tc.c \
- 		ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h
+ 		ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \
+ 		xtables.h libxtc.h