From: daryder Date: Mon, 6 Oct 2014 19:54:42 +0000 (-0400) Subject: Change JSON parsing to use libyajl X-Git-Tag: collectd-5.5.0~80^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e907a6d5a203efa3db47bddbe72f4ab7ea1221;p=thirdparty%2Fcollectd.git Change JSON parsing to use libyajl --- diff --git a/src/Makefile.am b/src/Makefile.am index 2b39ee9da..0b6268547 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -243,14 +243,10 @@ endif if BUILD_PLUGIN_CEPH pkglib_LTLIBRARIES += ceph.la ceph_la_SOURCES = ceph.c -ceph_la_LDFLAGS = -module -avoid-version -ceph_la_LIBADD = -ceph_la_CPPFLAGS = -if BUILD_WITH_LIBJSON_C -ceph_la_LDFLAGS += $(BUILD_WITH_LIBJSON_C_LDFLAGS) -ceph_la_LIBADD += $(BUILD_WITH_LIBJSON_C_LIBS) -ceph_la_CPPFLAGS += $(BUILD_WITH_LIBJSON_C_CPPFLAGS) -endif +ceph_la_CFLAGS = $(AM_CFLAGS) +ceph_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS) +ceph_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS) +ceph_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) collectd_LDADD += "-dlopen" ceph.la collectd_DEPENDENCIES += ceph.la endif