Merge branch 'collectd-4.8'

diff --combined configure.in
index 0343acd,a58002a..415ddd7
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1463,16 -1463,21 +1463,21 @@@ AC_ARG_WITH(libiptc, [AS_HELP_STRING([-
                with_libiptc="no (Linux only)"
        fi
  ])
- if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
+ LDFLAGS="$LDFLAGS $LIBIPTC_LDFLAGS"
+ if test "x$with_libiptc" = "xyes"
  then
-       AC_CHECK_LIB(iptc, iptc_init,
+       AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
        [
-               AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+               with_libiptc="no (Linux iptables headers not found)"
+               with_own_libiptc="no"
        ],
        [
-               with_libiptc="yes"
-               with_own_libiptc="yes"
+ #include "$srcdir/src/owniptc/ipt_kernel_headers.h"
        ])
+ 
  fi
  if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
@@@ -1485,27 -1490,8 +1490,8 @@@
                with_own_libiptc="yes"
        ])
  fi
- if test "x$with_libiptc" = "xyes"
- then
-       SAVE_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
- 
-       AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
-       [
-               with_libiptc="no (Linux iptables headers not found - check KERNEL_DIR)"
-               with_own_libiptc="no"
-       ],
-       [
- #include "$srcdir/src/owniptc/ipt_kernel_headers.h"
-       ])
- 
-       CPPFLAGS="$SAVE_CPPFLAGS"
- fi
- if test "x$with_libiptc" = "xyes"
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
-       SAVE_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
- 
        AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
        [
  #if OWN_LIBIPTC
@@@ -1516,8 -1502,17 +1502,17 @@@
  # include <libiptc/libip6tc.h>
  #endif
        ])
- 
-       CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ then
+       AC_CHECK_LIB(iptc, iptc_init,
+       [
+               AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+       ],
+       [
+               with_libiptc="yes"
+               with_own_libiptc="yes"
+       ])
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
  AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes")
@@@ -1532,6 -1527,8 +1527,8 @@@ if test "x$with_own_libiptc" = "xyes
  then
        AC_DEFINE(OWN_LIBIPTC, 1, [Define to 1 if we use the shipped iptc library.])
  fi
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ LDFLAGS="$SAVE_LDFLAGS"
  # }}}
  
  # --with-java {{{
@@@ -3803,7 -3800,6 +3800,7 @@@ AC_PLUGIN([tail],        [yes]
  AC_PLUGIN([tape],        [$plugin_tape],       [Tape drive statistics])
  AC_PLUGIN([target_notification], [yes],        [The notification target])
  AC_PLUGIN([target_replace], [yes],             [The replace target])
 +AC_PLUGIN([target_scale],[yes],                [The scale target])
  AC_PLUGIN([target_set],  [yes],                [The set target])
  AC_PLUGIN([tcpconns],    [$plugin_tcpconns],   [TCP connection statistics])
  AC_PLUGIN([teamspeak2],  [yes],                [TeamSpeak2 server statistics])
@@@ -4104,7 -4100,6 +4101,7 @@@ Configuration
      tape  . . . . . . . . $enable_tape
      target_notification . $enable_target_notification
      target_replace  . . . $enable_target_replace
 +    target_scale  . . . . $enable_target_scale
      target_set  . . . . . $enable_target_set
      tcpconns  . . . . . . $enable_tcpconns
      teamspeak2  . . . . . $enable_teamspeak2