Merge branch 'collectd-5.0'

Conflicts:
	configure.in
	src/owniptc/libiptc.c

Change-Id: I0ab8fc1accd476f5d1a243b1a155eac4b751cd8c

diff --combined configure.in
index f240466,f0a189c..3b641d1
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2,6 -2,7 +2,7 @@@ dnl Process this file with autoconf to 
  AC_INIT(collectd, m4_esyscmd(./version-gen.sh))
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
+ AC_CONFIG_AUX_DIR([libltdl/config])
  
  m4_ifdef([LT_PACKAGE_VERSION],
        # libtool >= 2.2
@@@ -1764,16 -1765,21 +1765,16 @@@ AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, te
  # }}}
  
  # --with-libiptc {{{
 -with_own_libiptc="no"
  AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
  [
 -      if test "x$withval" = "xshipped"
 -      then
 -              with_own_libiptc="yes"
 -              with_libiptc="yes"
 -      else if test "x$withval" != "xno" && test "x$withval" != "xyes"
 +      if test "x$withval" != "xno" && test "x$withval" != "xyes"
        then
                LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS -I$withval/include"
                LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS -L$withval/lib"
                with_libiptc="yes"
        else
                with_libiptc="$withval"
 -      fi; fi
 +      fi
  ],
  [
        if test "x$ac_system" = "xLinux"
@@@ -1788,37 -1794,72 +1789,37 @@@ SAVE_LDFLAGS="$LDFLAGS
  CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
  LDFLAGS="$LDFLAGS $LIBIPTC_LDFLAGS"
  # check whether the header file for libiptc is available.
 -if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 +if test "x$with_libiptc" = "xyes"
  then
        AC_CHECK_HEADERS(libiptc/libiptc.h,
 -      [
 -              AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
 -      ],
 -      [
 -              with_libiptc="yes"
 -              with_own_libiptc="yes"
 -      ])
 +                       [with_libiptc="yes"],
 +                       [with_libiptc="no (libiptc/libiptc.h not found)"])
  fi
 -if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 +if test "x$with_libiptc" = "xyes"
  then
        AC_CHECK_HEADERS(libiptc/libip6tc.h,
 -      [
 -              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"
 -      ])
 +                       [with_libiptc="yes"],
 +                       [with_libiptc="no (libiptc/libip6tc.h not found)"])
  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"
 +if test "x$with_libiptc" = "xyes"
  then
        AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
        [
 -#if OWN_LIBIPTC
 -# include "$srcdir/src/owniptc/libiptc.h"
 -# include "$srcdir/src/owniptc/libip6tc.h"
 -#else
 -# include <libiptc/libiptc.h>
 -# include <libiptc/libip6tc.h>
 -#endif
 +#include <libiptc/libiptc.h>
 +#include <libiptc/libip6tc.h>
        ])
  fi
  # Check for the iptc_init symbol in the library.
 -if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
 +if test "x$with_libiptc" = "xyes"
  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"
 -      ],
 -      [-lip4tc -lip6tc])
 -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"
 -      ])
 +                   [with_libiptc="yes"],
 +                   [with_libiptc="no (symbol 'iptc_init' not found)"])
  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"
  then
        BUILD_WITH_LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS"
@@@ -1826,6 -1867,10 +1827,6 @@@
        AC_SUBST(BUILD_WITH_LIBIPTC_CPPFLAGS)
        AC_SUBST(BUILD_WITH_LIBIPTC_LDFLAGS)
  fi
 -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"
  # }}}
@@@ -3820,6 -3865,7 +3821,7 @@@ the
        CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
  
        AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
+       AC_CHECK_HEADERS(yajl/yajl_version.h)
  
        CPPFLAGS="$SAVE_CPPFLAGS"
  fi
@@@ -4808,7 -4854,7 +4810,7 @@@ AC_SUBST(LCC_VERSION_STRING
  
  AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
  
 -AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
 +AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
  
  if test "x$with_librrd" = "xyes" \
        && test "x$librrd_threadsafe" != "xyes"
@@@ -4816,6 -4862,11 +4818,6 @@@ the
        with_librrd="yes (warning: librrd is not thread-safe)"
  fi
  
 -if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
 -then
 -      with_libiptc="yes (shipped version)"
 -fi
 -
  if test "x$with_libperl" = "xyes"
  then
        with_libperl="yes (version `$perl_interpreter -MConfig -e 'print $Config{version};'`)"