From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 5 Dec 2016 18:49:07 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~291
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c7fa732db30f2886e64829047e8912bd84afb65f;hp=-c

Merge branch 'collectd-5.7'
---

c7fa732db30f2886e64829047e8912bd84afb65f
diff --combined configure.ac
index c66ff7d5,993e319e..3ef5f824
--- a/configure.ac
+++ b/configure.ac
@@@ -3,15 -3,34 +3,15 @@@ AC_PREREQ([2.60]
  AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
  AC_CONFIG_SRCDIR(src/target_set.c)
  AC_CONFIG_HEADERS(src/config.h)
 -AC_CONFIG_AUX_DIR([libltdl/config])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AC_CONFIG_MACRO_DIR([m4])
  
  dnl older automake's default of ARFLAGS=cru is noisy on newer binutils;
  dnl we don't really need the 'u' even in older toolchains.  Then there is
  dnl older libtool, which spelled it AR_FLAGS
  m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])
  
 -m4_ifdef([LT_PACKAGE_VERSION],
 -	# libtool >= 2.2
 -	[
 -	 LT_CONFIG_LTDL_DIR([libltdl])
 -	 LT_INIT([dlopen])
 -	 LTDL_INIT([convenience])
 -	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
 -	]
 -,
 -	# libtool <= 1.5
 -	[
 -	 AC_LIBLTDL_CONVENIENCE
 -	 AC_SUBST(LTDLINCL)
 -	 AC_SUBST(LIBLTDL)
 -	 AC_LIBTOOL_DLOPEN
 -	 AC_CONFIG_SUBDIRS(libltdl)
 -	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
 -	]
 -)
 -
 -AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
 +LT_INIT([dlopen])
  
  AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@@ -37,6 -56,7 +37,6 @@@ AM_PROG_CC_C_
  AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes")
  
  AC_DISABLE_STATIC
 -AC_PROG_LIBTOOL
  AC_PROG_LEX
  AC_PROG_YACC
  
@@@ -59,12 -79,6 +59,12 @@@ the
  	AC_MSG_ERROR([bison is missing and you do not have ${srcdir}/src/liboconfig/parser.c. Please install bison])
  fi
  
 +AS_IF([test "x$lt_cv_dlopen" = "xno"],
 +  [AC_MSG_ERROR([Your system does not support dlopen])]
 +)
 +
 +AC_SUBST([DLOPEN_LIBS], [$lt_cv_dlopen_libs])
 +
  AC_ARG_VAR([PROTOC], [path to the protoc binary])
  AC_PATH_PROG([PROTOC], [protoc])
  have_protoc3="no"
@@@ -2592,8 -2606,6 +2592,6 @@@ f
  # }}}
  
  # --with-libdpdk {{{
- LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
- LIBDPDK_LDFLAGS=""
  AC_ARG_VAR([LIBDPDK_CPPFLAGS], [Preprocessor flags for libdpdk])
  AC_ARG_VAR([LIBDPDK_LDFLAGS], [Linker flags for libdpdk])
  
@@@ -2601,6 -2613,10 +2599,10 @@@ AC_ARG_WITH([libdpdk], [AS_HELP_STRING(
  
  if test "x$with_libdpdk" != "xno"
  then
+ 	if test "x$LIBDPDK_CPPFLAGS" = "x"
+ 	then
+ 		LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
+ 	fi
  	SAVE_CPPFLAGS="$CPPFLAGS"
  	CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
  	AC_CHECK_HEADERS([rte_config.h],
@@@ -2615,7 -2631,7 +2617,7 @@@ the
  	SAVE_LDFLAGS="$LDFLAGS"
  	LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
  	AC_CHECK_LIB([dpdk], [rte_eal_init],
- 		[with_libdpkd="yes"],
+ 		[with_libdpdk="yes"],
  		[with_libdpdk="no (symbol 'rte_eal_init' not found)"]
  	)
  	LDFLAGS="$SAVE_LDFLAGS"
@@@ -6318,7 -6334,7 +6320,7 @@@ the
    plugin_xencpu="yes"
  fi
  
- if test "x$with_libdpkd" = "xyes"
+ if test "x$with_libdpdk" = "xyes"
  then
    plugin_dpdkstat="yes"
  fi