Merge branch 'ff/filter'

diff --combined configure.in
index 98e9fde,0d1bd25..562ae34
--- 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,7 -2945,6 +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])
@@@ -2970,6 -2954,7 +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])
@@@ -3135,7 -3120,6 +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
@@@ -3145,6 -3129,7 +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