Merge branch 'ka/pinba'

diff --combined configure.in
index ac07f00,84cccba..804cdfc
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -47,6 -47,9 +47,9 @@@ AC_PROG_LE
  AC_PROG_YACC
  PKG_PROG_PKG_CONFIG
  
+ AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])
+ AM_CONDITIONAL(HAVE_PROTOC_C, test "x$have_protoc_c" = "xyes")
+ 
  AC_MSG_CHECKING([for kernel type ($host_os)])
  case $host_os in
        *linux*)
@@@ -115,7 -118,7 +118,7 @@@ AC_HEADER_SYS_WAI
  AC_HEADER_DIRENT
  AC_HEADER_STDBOOL
  
 -AC_CHECK_HEADERS(stdio.h stdint.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
 +AC_CHECK_HEADERS(stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
  
  # For ping library
  AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
@@@ -477,7 -480,7 +480,7 @@@ AC_HEADER_TIM
  # Checks for library functions.
  #
  AC_PROG_GCC_TRADITIONAL
 -AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog sysconf if_indextoname)
 +AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog sysconf setenv if_indextoname)
  
  AC_FUNC_STRERROR_R
  
@@@ -715,9 -718,6 +718,9 @@@ if test "x$fp_layout_type" = "xunknown"
  #if HAVE_STDINT_H
  # include <stdint.h>
  #endif
 +#if HAVE_INTTYPES_H
 +# include <inttypes.h>
 +#endif
  #if HAVE_STDBOOL_H
  # include <stdbool.h>
  #endif
@@@ -762,9 -762,6 +765,9 @@@ if test "x$fp_layout_type" = "xunknown"
  #if HAVE_STDINT_H
  # include <stdint.h>
  #endif
 +#if HAVE_INTTYPES_H
 +# include <inttypes.h>
 +#endif
  #if HAVE_STDBOOL_H
  # include <stdbool.h>
  #endif
@@@ -817,9 -814,6 +820,9 @@@ if test "x$fp_layout_type" = "xunknown"
  #if HAVE_STDINT_H
  # include <stdint.h>
  #endif
 +#if HAVE_INTTYPES_H
 +# include <inttypes.h>
 +#endif
  #if HAVE_STDBOOL_H
  # include <stdbool.h>
  #endif
@@@ -956,8 -950,8 +959,8 @@@ AC_MSG_CHECKING([if have htonll defined
         AC_LANG_PROGRAM([
  #include <sys/types.h>
  #include <netinet/in.h>
 -#ifdef HAVE_INTTYPES_H
 -#include <inttypes.h> 
 +#if HAVE_INTTYPES_H
 +# include <inttypes.h>
  #endif
         ], [
            return htonll(0);
@@@ -4304,6 -4298,8 +4307,8 @@@ AC_PLUGIN([onewire],     [$with_libowca
  AC_PLUGIN([openvpn],     [yes],                [OpenVPN client statistics])
  AC_PLUGIN([oracle],      [$with_oracle],       [Oracle plugin])
  AC_PLUGIN([perl],        [$plugin_perl],       [Embed a Perl interpreter])
+ # FIXME: Check for libevent, too.
+ AC_PLUGIN([pinba],       [$have_protoc_c],     [Pinba statistics])
  AC_PLUGIN([ping],        [$with_liboping],     [Network latency statistics])
  AC_PLUGIN([postgresql],  [$with_libpq],        [PostgreSQL database statistics])
  AC_PLUGIN([powerdns],    [yes],                [PowerDNS statistics])
@@@ -4545,6 -4541,8 +4550,8 @@@ Configuration
      libxml2 . . . . . . . $with_libxml2
      libxmms . . . . . . . $with_libxmms
      libyajl . . . . . . . $with_libyajl
+     libevent  . . . . . . $with_libevent
+     protobuf-c  . . . . . $have_protoc_c
      oracle  . . . . . . . $with_oracle
      python  . . . . . . . $with_python
  
@@@ -4617,6 -4615,7 +4624,7 @@@
      openvpn . . . . . . . $enable_openvpn
      oracle  . . . . . . . $enable_oracle
      perl  . . . . . . . . $enable_perl
+     pinba . . . . . . . . $enable_pinba
      ping  . . . . . . . . $enable_ping
      postgresql  . . . . . $enable_postgresql
      powerdns  . . . . . . $enable_powerdns