Code

Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 08:00:00 +0000 (09:00 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 08:00:00 +0000 (09:00 +0100)
1  2 
configure.in
src/Makefile.am
src/filecount.c
src/libiptc/Makefile.am
src/perl.c

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/filecount.c
Simple merge
index 3a6ef6757a422f34f6ec6337094fe4a16b0fa9b9,ffa98878e5784db99991455ea9be27b4b67542d5..a8ed93cce01e2f7280415a6744a90f31d9ca9ad1
@@@ -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
  
diff --cc src/perl.c
Simple merge