Merge branch 'collectd-4.3' into collectd-4.4

diff --cc configure.in
index 08b2ca4,9337523..3876b4f
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2550,9 -2420,10 +2554,10 @@@ f
  AC_SUBST(PERL_BINDINGS)
  AC_SUBST(PERL_BINDINGS_OPTIONS)
  
 -AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
 +AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
  
- if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes"
+ if test "x$with_rrdtool" = "xyes" \
+       && test "x$librrd_threadsafe" != "xyes"
  then
        with_rrdtool="yes (warning: librrd is not thread-safe)"
  fi