From: Pierre-Yves Ritschard Date: Sat, 15 Nov 2014 09:52:47 +0000 (+0100) Subject: Merge pull request #719 from mfournier/openldap-improvements-rebased X-Git-Tag: collectd-5.5.0~152 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2421812ea47269c50920414a6e3c32448800120f;p=collectd.git Merge pull request #719 from mfournier/openldap-improvements-rebased Openldap plugin --- 2421812ea47269c50920414a6e3c32448800120f diff --cc src/Makefile.am index 74c5007a,315d1957..04c77a3b --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -720,14 -908,23 +720,22 @@@ endi if BUILD_PLUGIN_ONEWIRE pkglib_LTLIBRARIES += onewire.la -onewire_la_SOURCES = onewire.c +onewire_la_SOURCES = onewire.c \ + utils_ignorelist.c utils_ignorelist.h onewire_la_CFLAGS = $(AM_CFLAGS) -onewire_la_CPPFLAGS = $(BUILD_WITH_LIBOWCAPI_CPPFLAGS) +onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS) onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS) -onewire_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" onewire.la -collectd_DEPENDENCIES += onewire.la +onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS) endif + if BUILD_PLUGIN_OPENLDAP + pkglib_LTLIBRARIES += openldap.la + openldap_la_SOURCES = openldap.c + openldap_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBLDAP_LDFLAGS) + openldap_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBLDAP_CPPFLAGS) + openldap_la_LIBADD = -lldap + endif + if BUILD_PLUGIN_OPENVPN pkglib_LTLIBRARIES += openvpn.la openvpn_la_SOURCES = openvpn.c