Merge pull request #719 from mfournier/openldap-improvements-rebased

Openldap plugin

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
index 74c5007accca9b65041d78b2bb73b82154d272ad,315d1957f5c39237da99cbc1a0c01100e8f42740..04c77a3b085212ff807fa34922e4a5ed7a9401e5
--- 1/src/Makefile.am
--- 2/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

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge