Merge branch 'ff/libcollectdclient'

diff --combined configure.in
index 562ae34860ce94497a20ec5282e1b4b8310002e2,f911a7895733cc457e71c2b4e07b4743dfeaa564..bcd4cc45f1b6ebbbc4f403ba747e7e0591717d09
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -610,13 -610,8 +610,13 @@@ if test "x$fp_layout_type" = "xunknown"
        [[[[
  #include <stdlib.h>
  #include <stdio.h>
 -#include <stdint.h>
  #include <string.h>
 +#if HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#if HAVE_STDBOOL_H
 +# include <stdbool.h>
 +#endif
        ]]]],
        [[[[
        uint64_t i0;
@@@ -654,13 -649,8 +654,13 @@@ if test "x$fp_layout_type" = "xunknown"
        [[[[
  #include <stdlib.h>
  #include <stdio.h>
 -#include <stdint.h>
  #include <string.h>
 +#if HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#if HAVE_STDBOOL_H
 +# include <stdbool.h>
 +#endif
  #define endianflip(A) ((((uint64_t)(A) & 0xff00000000000000LL) >> 56) | \
                         (((uint64_t)(A) & 0x00ff000000000000LL) >> 40) | \
                         (((uint64_t)(A) & 0x0000ff0000000000LL) >> 24) | \
@@@ -706,13 -696,8 +706,13 @@@ if test "x$fp_layout_type" = "xunknown"
        [[[[
  #include <stdlib.h>
  #include <stdio.h>
 -#include <stdint.h>
  #include <string.h>
 +#if HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#if HAVE_STDBOOL_H
 +# include <stdbool.h>
 +#endif
  #define intswap(A)    ((((uint64_t)(A) & 0xffffffff00000000LL) >> 32) | \
                         (((uint64_t)(A) & 0x00000000ffffffffLL) << 32))
        ]]]],
@@@ -2960,6 -2945,7 +2960,6 @@@ AC_PLUGIN([entropy],     [$plugin_entro
  AC_PLUGIN([exec],        [yes],                [Execution of external programs])
  AC_PLUGIN([filecount],   [yes],                [Count files in directories])
  AC_PLUGIN([filter_ignore], [yes],                [Ignore specific values])
 -AC_PLUGIN([filter_pcre], [$with_libpcre],      [Filter based on PCRE])
  AC_PLUGIN([hddtemp],     [yes],                [Query hddtempd])
  AC_PLUGIN([interface],   [$plugin_interface],  [Interface traffic statistics])
  AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters])
@@@ -2969,7 -2955,6 +2969,7 @@@ AC_PLUGIN([irq],         [$plugin_irq]
  AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics])
  AC_PLUGIN([load],        [$plugin_load],       [System load])
  AC_PLUGIN([logfile],     [yes],                [File logging plugin])
 +AC_PLUGIN([match_regex], [yes],                [The regex match])
  AC_PLUGIN([mbmon],       [yes],                [Query mbmond])
  AC_PLUGIN([memcached],   [yes],                [memcached statistics])
  AC_PLUGIN([memory],      [$plugin_memory],     [Memory usage])
@@@ -3046,7 -3031,7 +3046,7 @@@ f
  AC_SUBST(PERL_BINDINGS)
  AC_SUBST(PERL_BINDINGS_OPTIONS)
  
- AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
+ AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
  
  if test "x$with_librrd" = "xyes" \
        && test "x$librrd_threadsafe" != "xyes"
@@@ -3135,6 -3120,7 +3135,6 @@@ Configuration
      exec  . . . . . . . . $enable_exec
      filecount . . . . . . $enable_filecount
      filter_ignore . . . . $enable_filter_ignore
 -    filter_pcre . . . . . $enable_filter_pcre
      hddtemp . . . . . . . $enable_hddtemp
      interface . . . . . . $enable_interface
      iptables  . . . . . . $enable_iptables
@@@ -3144,7 -3130,6 +3144,7 @@@
      libvirt . . . . . . . $enable_libvirt
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
 +    match_regex . . . . . $enable_match_regex
      mbmon . . . . . . . . $enable_mbmon
      memcached . . . . . . $enable_memcached
      memory  . . . . . . . $enable_memory

diff --combined src/Makefile.am
index 24f06fdbb7e7f1f9ea4b6a120122e31098569544,f0e2dca29b03384d360eb9d7738c1b2560404e7a..da12539bf7ff050774764fb0a6be9d0ace92b90e
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
- SUBDIRS =
+ SUBDIRS = libcollectdclient
  if BUILD_WITH_OWN_LIBIPTC
  SUBDIRS += libiptc
  endif
@@@ -29,7 -29,6 +29,7 @@@ bin_PROGRAMS = collectd-nagio
  collectd_SOURCES = collectd.c collectd.h \
                   common.c common.h \
                   configfile.c configfile.h \
 +                 filter_chain.c filter_chain.h \
                   plugin.c plugin.h \
                   utils_avltree.c utils_avltree.h \
                   utils_cache.c utils_cache.h \
@@@ -92,6 -91,8 +92,8 @@@ collectd_nagios_LDFLAGS 
  if BUILD_WITH_LIBSOCKET
  collectd_nagios_LDFLAGS += -lsocket
  endif
+ collectd_nagios_LDADD = libcollectdclient/libcollectdclient.la
+ collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
  
  pkglib_LTLIBRARIES = 
  
@@@ -284,6 -285,16 +286,6 @@@ collectd_LDADD += "-dlopen" filter_igno
  collectd_DEPENDENCIES += filter_ignore.la
  endif
  
 -if BUILD_PLUGIN_FILTER_PCRE
 -pkglib_LTLIBRARIES += filter_pcre.la
 -filter_pcre_la_SOURCES = filter_pcre.c
 -filter_pcre_la_CPPFLAGS = $(BUILD_WITH_LIBPCRE_CFLAGS)
 -filter_pcre_la_LDFLAGS = -module -avoid-version \
 -              $(BUILD_WITH_LIBPCRE_LIBS)
 -collectd_LDADD += "-dlopen" filter_pcre.la
 -collectd_DEPENDENCIES += filter_pcre.la
 -endif
 -
  if BUILD_PLUGIN_HDDTEMP
  pkglib_LTLIBRARIES += hddtemp.la
  hddtemp_la_SOURCES = hddtemp.c
@@@ -390,16 -401,6 +392,16 @@@ collectd_LDADD += "-dlopen" logfile.l
  collectd_DEPENDENCIES += logfile.la
  endif
  
 +if BUILD_PLUGIN_MATCH_REGEX
 +pkglib_LTLIBRARIES += match_regex.la
 +match_regex_la_SOURCES = match_regex.c
 +match_regex_la_CPPFLAGS = $(BUILD_WITH_LIBPCRE_CFLAGS)
 +match_regex_la_LDFLAGS = -module -avoid-version \
 +              $(BUILD_WITH_LIBPCRE_LIBS)
 +collectd_LDADD += "-dlopen" match_regex.la
 +collectd_DEPENDENCIES += match_regex.la
 +endif
 +
  if BUILD_PLUGIN_MBMON
  pkglib_LTLIBRARIES += mbmon.la
  mbmon_la_SOURCES = mbmon.c