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

[Florian Forster]

 configure.in    |  101 ++++++++++++++++++++++++++++++++++++++++++++++--------
 src/Makefile.am |  101 ++++++++++++++++++++++++------------------------------
 2 files changed, 131 insertions(+), 71 deletions(-)

New commits:
commit c74b709edf61a3b7dfc24032f609956f0feb56e7
Merge: d5e428c8fc7e1423e3082492274547c708b1cec3 d8a27138e0fc455088443ca034942a00c3b4eecd
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:43:27 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3

commit d8a27138e0fc455088443ca034942a00c3b4eecd
Merge: 4aed4a7a08b80608c532d2da7eb7fe43c2945e13 9408d0b6c09eda66861826debd7f63a1e0cf5aea
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:43:19 2008 +0200

    Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2

commit d5e428c8fc7e1423e3082492274547c708b1cec3
Merge: c192de2c944bf9c73903b4a6ac8379db3acc5955 8caa0d691d9f6c22013aeaea7b6aa97be9f0a862
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:43:04 2008 +0200

    Merge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3

commit c192de2c944bf9c73903b4a6ac8379db3acc5955
Merge: ae6f041d23a71073e447f50f01e5d9ec1ffb34bd 4aed4a7a08b80608c532d2da7eb7fe43c2945e13
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 16:52:08 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3
    
    Conflicts:
    
    	src/Makefile.am

commit 4aed4a7a08b80608c532d2da7eb7fe43c2945e13
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 11:34:22 2008 +0200

    build system: Use pkg-config to determine flags for the statgrab library.

commit ae6f041d23a71073e447f50f01e5d9ec1ffb34bd
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 10:27:38 2008 +0200

    build system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or libvirt.