Merge branch 'collectd-4.8'

diff --combined configure.in
index 415ddd7,a898d74..c08a61a
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1467,29 -1467,32 +1467,32 @@@ SAVE_CPPFLAGS="$CPPFLAGS
  SAVE_LDFLAGS="$LDFLAGS"
  CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
  LDFLAGS="$LDFLAGS $LIBIPTC_LDFLAGS"
- if test "x$with_libiptc" = "xyes"
+ # check whether the header file for libiptc is available.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
-       AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
+       AC_CHECK_HEADERS(libiptc/libiptc.h,
        [
-               with_libiptc="no (Linux iptables headers not found)"
-               with_own_libiptc="no"
+               AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
        ],
        [
- #include "$srcdir/src/owniptc/ipt_kernel_headers.h"
+               with_libiptc="yes"
+               with_own_libiptc="yes"
        ])
- 
  fi
  if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
-       AC_CHECK_HEADERS(libiptc/libiptc.h,
+       AC_CHECK_HEADERS(libiptc/libip6tc.h,
        [
-               AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
+               AC_DEFINE(HAVE_LIBIPTC_LIBIP6TC_H, 1, [Define to 1 if you have the <libiptc/libip6tc.h> header file.])
        ],
        [
                with_libiptc="yes"
                with_own_libiptc="yes"
        ])
  fi
+ # If the header file is available, check for the required type declaractions.
+ # They may be missing in old versions of libiptc. In that case, they will be
+ # declared in the iptables plugin.
  if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
        AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
@@@ -1503,6 -1506,7 +1506,7 @@@
  #endif
        ])
  fi
+ # Check for the iptc_init symbol in the library.
  if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
        AC_CHECK_LIB(iptc, iptc_init,
@@@ -1514,6 -1518,19 +1518,19 @@@
                with_own_libiptc="yes"
        ])
  fi
+ # The system wide version failed for some reason. Check if we have the required
+ # headers to build the shipped version.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
+ then
+       AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h linux/netfilter/x_tables.h, [],
+       [
+               with_libiptc="no (Linux iptables headers not found)"
+               with_own_libiptc="no"
+       ],
+       [
+ #include "$srcdir/src/owniptc/ipt_kernel_headers.h"
+       ])
+ fi
  AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
  AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes")
  if test "x$with_libiptc" = "xyes"
@@@ -3800,7 -3817,6 +3817,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])
@@@ -4101,7 -4117,6 +4118,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