[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/owniptc/Makefile.am |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

New commits:
commit 5a4daa815531077fdf8b3e425b92f88fa0abb42a
Merge: f21223850375057ea74f9e9f4feed264d98c8a78 0384380080a39adb252a4d5dd3a6bf5c27f8faf8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 17 10:16:40 2009 +0200

    Merge branch 'collectd-4.8'

commit 0384380080a39adb252a4d5dd3a6bf5c27f8faf8
Merge: 4374305bd9523620d4291c9be5bfd81640f789a7 84014b619d09bd1091724a4086222954e8c2450a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 17 10:16:35 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8

commit 84014b619d09bd1091724a4086222954e8c2450a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 17 10:12:07 2009 +0200

    src/owniptc/Makefile.am: Don't search KERNEL_DIR for headers.
    
    The iptc library is currenly only enabled, if the required headers where
    found without “-I${KERNEL_DIR}”. Adding it to the CFLAGS when building
    the shipped version of libiptc just breaks things, for example on
    “collectd-master-amd64-linux-2.6”:
      Linux hotdamn 2.6.9-42.ELsmp #1 SMP Tue Aug 15 10:35:26 BST 2006 x86_64 x86_64 x86_64 GNU/Linux