X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=098c07b098e2193f1cdc85ac012086d9fd5d45f8;hb=4027126a75439c7d2b1d5572092fd291ef19ead6;hp=fee47b17272a1414629bd8f32769f6b16d666064;hpb=79367f94108a13a62f1ad3ef9d1045c5401e82c4;p=collectd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index fee47b17..098c07b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,6 @@ endif
 if BUILD_WITH_OWN_LIBOCONFIG
 SUBDIRS += liboconfig
 endif
-if BUILD_WITH_OWN_LIBOPING
-SUBDIRS += liboping
-endif
 
 if COMPILER_IS_GCC
 AM_CFLAGS = -Wall -Werror
@@ -470,6 +467,16 @@ collectd_LDADD += "-dlopen" mbmon.la
 collectd_DEPENDENCIES += mbmon.la
 endif
 
+if BUILD_PLUGIN_MEMCACHEC
+pkglib_LTLIBRARIES += memcachec.la
+memcachec_la_SOURCES = memcachec.c
+memcachec_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBMEMCACHED_LDFLAGS)
+memcachec_la_CPPFLAGS = $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS)
+memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS)
+collectd_LDADD += "-dlopen" memcachec.la
+collectd_DEPENDENCIES += memcachec.la
+endif
+
 if BUILD_PLUGIN_MEMCACHED
 pkglib_LTLIBRARIES += memcached.la
 memcached_la_SOURCES = memcached.c
@@ -664,13 +671,9 @@ endif
 if BUILD_PLUGIN_PING
 pkglib_LTLIBRARIES += ping.la
 ping_la_SOURCES = ping.c
-ping_la_LDFLAGS = -module -avoid-version
-if BUILD_WITH_OWN_LIBOPING
-ping_la_LIBADD = liboping/liboping.la
-ping_la_DEPENDENCIES = liboping/liboping.la
-else
+ping_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOPING_CPPFLAGS)
+ping_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBOPING_LDFLAGS)
 ping_la_LIBADD = -loping
-endif
 collectd_LDADD += "-dlopen" ping.la
 collectd_DEPENDENCIES += ping.la
 endif