Code

Change JSON parsing to use libyajl
authordaryder <daryder@cisco.com>
Mon, 6 Oct 2014 19:54:42 +0000 (15:54 -0400)
committerdaryder <daryder@cisco.com>
Mon, 6 Oct 2014 19:54:42 +0000 (15:54 -0400)
src/Makefile.am

index 2b39ee9daf5db4807e24a5c6b926c3d9960c1cf0..0b62685479e9e42c75a05447e07baadf8ccbfd87 100644 (file)
@@ -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