From: Florian Forster <octo@collectd.org>
Date: Mon, 9 Oct 2017 10:59:57 +0000 (+0200)
Subject: write_gcm plugin: Build only when libyajl 2 is avaiable.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9d82e21a6e4f3ef01b16228f990aa11cb45a6454;p=collectd.git

write_gcm plugin: Build only when libyajl 2 is avaiable.
---

diff --git a/Makefile.am b/Makefile.am
index c44955cc..93a4ca89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -576,7 +576,7 @@ liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB)
 
 if BUILD_WITH_LIBCURL
 if BUILD_WITH_LIBSSL
-if BUILD_WITH_LIBYAJL
+if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += liboauth.la
 liboauth_la_SOURCES = \
 	src/utils_oauth.c \
@@ -615,7 +615,7 @@ libgce_la_LIBADD = \
 	$(BUILD_WITH_LIBCURL_LIBS)
 endif
 
-if BUILD_WITH_LIBYAJL
+if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += libformat_gcm.la
 libformat_gcm_la_SOURCES = \
 	src/utils_format_gcm.c \
diff --git a/configure.ac b/configure.ac
index b32af6e2..92c81eeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5844,6 +5844,7 @@ AC_SUBST([BUILD_WITH_LIBYAJL_LDFLAGS])
 AC_SUBST([BUILD_WITH_LIBYAJL_LIBS])
 
 AM_CONDITIONAL([BUILD_WITH_LIBYAJL], [test "x$with_libyajl" = "xyes"])
+AM_CONDITIONAL([BUILD_WITH_LIBYAJL2], [test "x$with_libyajl$with_libyajl2" = "xyesyes"])
 # }}}
 
 # --with-mic {{{
@@ -6561,6 +6562,9 @@ fi
 
 if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes"; then
   plugin_curl_json="yes"
+fi
+
+if test "x$with_libcurl" = "xyes" && test "x$with_libssl" = "xyes" && test "x$with_libyajl" = "xyes" && test "x$with_libyajl2" = "xyes"; then
   plugin_write_gcm="yes"
 fi