Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:

	src/Makefile.am

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
index f81fbbd,92627b9..3902795
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -37,11 -35,8 +37,10 @@@ collectd_SOURCES = collectd.c collectd.
                   utils_complain.c utils_complain.h \
                   utils_ignorelist.c utils_ignorelist.h \
                   utils_llist.c utils_llist.h \
 +                 utils_parse_option.c utils_parse_option.h \
                   utils_tail_match.c utils_tail_match.h \
                   utils_match.c utils_match.h \
-                  utils_mount.c utils_mount.h \
 +                 utils_subst.c utils_subst.h \
                   utils_tail.c utils_tail.h \
                   utils_threshold.c utils_threshold.h \
                   types_list.c types_list.h
@@@ -201,34 -183,9 +200,34 @@@ collectd_LDADD += "-dlopen" csv.l
  collectd_DEPENDENCIES += csv.la
  endif
  
 +if BUILD_PLUGIN_CURL
 +pkglib_LTLIBRARIES += curl.la
 +curl_la_SOURCES = curl.c
 +curl_la_LDFLAGS = -module -avoid-version
 +curl_la_CFLAGS = $(AM_CFLAGS)
 +curl_la_LIBADD =
 +collectd_LDADD += "-dlopen" curl.la
 +if BUILD_WITH_LIBCURL
 +curl_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 +curl_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 +endif
 +collectd_DEPENDENCIES += curl.la
 +endif
 +
 +if BUILD_PLUGIN_DBI
 +pkglib_LTLIBRARIES += dbi.la
 +dbi_la_SOURCES = dbi.c \
 +               utils_db_query.c utils_db_query.h
 +dbi_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBDBI_CPPFLAGS)
 +dbi_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBDBI_LDFLAGS)
 +dbi_la_LIBADD = $(BUILD_WITH_LIBDBI_LIBS)
 +collectd_LDADD += "-dlopen" dbi.la
 +collectd_DEPENDENCIES += dbi.la
 +endif
 +
  if BUILD_PLUGIN_DF
  pkglib_LTLIBRARIES += df.la
- df_la_SOURCES = df.c
+ df_la_SOURCES = df.c utils_mount.c utils_mount.h
  df_la_LDFLAGS = -module -avoid-version
  collectd_LDADD += "-dlopen" df.la
  collectd_DEPENDENCIES += df.la