X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=a62d608bf21fe35ac40df7662f6c64ea67a24264;hb=bc389fa32a48a64306f7ec008f4548f05fdb7c80;hp=8ca5d0184abe606c59f8b7aea6e47aabae6e708f;hpb=d11c1f68458465f1c9dcfd0396704b7fba7d5804;p=collectd.git

diff --git a/configure.in b/configure.in
index 8ca5d018..a62d608b 100644
--- a/configure.in
+++ b/configure.in
@@ -1844,7 +1844,7 @@ then
 
 	if test "$with_libgcrypt" != "no"; then
 		AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
-		GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS"
+		GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
 		GCRYPT_LIBS="$LIBGCRYPT_LIBS"
 	fi
 fi
@@ -4956,7 +4956,7 @@ AC_PLUGIN([oracle],      [$with_oracle],       [Oracle plugin])
 AC_PLUGIN([perl],        [$plugin_perl],       [Embed a Perl interpreter])
 AC_PLUGIN([pf],          [$have_net_pfvar_h],  [BSD packet filter (PF) statistics])
 # FIXME: Check for libevent, too.
-AC_PLUGIN([pinba],       [$have_protobuf_c_h], [Pinba statistics])
+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])
@@ -4999,7 +4999,7 @@ AC_PLUGIN([write_graphite], [yes],             [Graphite / Carbon output plugin]
 AC_PLUGIN([write_http],  [$with_libcurl],      [HTTP output plugin])
 AC_PLUGIN([write_mongodb], [$with_libmongoc],  [MongoDB output plugin])
 AC_PLUGIN([write_redis], [$with_libcredis],    [Redis output plugin])
-AC_PLUGIN([write_riemann], [$have_protobuf_c_h], [Riemann output plugin])
+AC_PLUGIN([write_riemann], [$have_protoc_c],   [Riemann output plugin])
 AC_PLUGIN([xmms],        [$with_libxmms],      [XMMS statistics])
 AC_PLUGIN([zfs_arc],     [$plugin_zfs_arc],    [ZFS ARC statistics])