X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=9d49d915675602c1ae5238172932837a897aa737;hb=51d29979b01ae0316597898f0e25d4bab7fd7d81;hp=49baf0a35f323613e880e439f37af733bdced802;hpb=e81567f2a645fd15f4384ca9569119bc66c1412a;p=collectd.git diff --git a/configure.ac b/configure.ac index 49baf0a3..9d49d915 100644 --- a/configure.ac +++ b/configure.ac @@ -835,12 +835,18 @@ AC_CHECK_HEADERS(sys/capability.h, [have_capability="yes"], [have_capability="no ( not found)"]) if test "x$have_capability" = "xyes"; then -AC_CHECK_LIB(cap, cap_get_bound, +AC_CHECK_LIB(cap, cap_get_proc, [have_capability="yes"], - [have_capability="no (cap_get_bound() not found)"]) + [have_capability="no (cap_get_proc() not found)"]) fi if test "x$have_capability" = "xyes"; then - AC_DEFINE(HAVE_CAPABILITY, 1, [Define to 1 if you have cap_get_bound() (-lcap).]) +AC_CHECK_DECL([CAP_IS_SUPPORTED], + [have_capability="yes"], + [have_capability="no (CAP_IS_SUPPORTED not found)"], + [[#include ]]) +fi +if test "x$have_capability" = "xyes"; then + AC_DEFINE(HAVE_CAPABILITY, 1, [Define to 1 if you have cap_get_proc() (-lcap).]) fi AM_CONDITIONAL(BUILD_WITH_CAPABILITY, test "x$have_capability" = "xyes") @@ -2606,78 +2612,37 @@ fi # }}} # --with-libdpdk {{{ -AC_ARG_WITH(libdpdk, [AS_HELP_STRING([--with-libdpdk@<:@=PREFIX@:>@], [Path to the DPDK build directory.])], -[ - if test "x$withval" != "xno" && test "x$withval" != "xyes" - then - RTE_BUILD="$withval" - with_libdpdk="yes" - else - RTE_BUILD="/usr" - with_libdpdk="$withval" - fi - DPDK_INCLUDE="$RTE_BUILD/include" - DPDK_LIB_DIR="$RTE_BUILD/lib" - FOUND_DPDK=yes -], [with_libdpdk="no"]) - -if test "x$with_libdpdk" = "xyes" -then - LOCAL_DPDK_INSTALL="no" - AC_CHECK_HEADER([$DPDK_INCLUDE/rte_config.h], [LOCAL_DPDK_INSTALL=yes], - [AC_CHECK_HEADER([$DPDK_INCLUDE/dpdk/rte_config.h], - [], - [FOUND_DPDK=no], [])], []) +AC_ARG_VAR([LIBDPDK_CPPFLAGS], [Preprocessor flags for libdpdk]) +AC_ARG_VAR([LIBDPDK_LDFLAGS], [Linker flags for libdpdk]) - if test "x$LOCAL_DPDK_INSTALL" = "xno" - then - DPDK_INCLUDE=$DPDK_INCLUDE/dpdk - fi +AC_ARG_WITH([libdpdk], [AS_HELP_STRING([--without-libdpdk], [Disable libdpdk.])]) - if test "x$FOUND_DPDK" = "xno" +if test "x$with_libdpdk" != "xno" +then + if test "x$LIBDPDK_CPPFLAGS" = "x" then - AC_MSG_ERROR([libdpdk error: rte_config.h not found]) + LIBDPDK_CPPFLAGS="-I/usr/include/dpdk" fi + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS" + AC_CHECK_HEADERS([rte_config.h], + [with_libdpdk="yes"], + [with_libdpdk="no (rte_config.h not found)"] + ) + CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_libdpdk" = "xyes" then SAVE_LDFLAGS="$LDFLAGS" - - if test "x$LOCAL_DPDK_INSTALL" != "xyes" - then - LDFLAGS="$LDFLAGS -L$DPDK_LIB_DIR" - fi - - AC_CHECK_LIB(dpdk, rte_eal_init, - [BUILD_WITH_DPDK_LIBS="-Wl,-ldpdk"], - [FOUND_DPDK=no]) - + LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS" + AC_CHECK_LIB([dpdk], [rte_eal_init], + [with_libdpdk="yes"], + [with_libdpdk="no (symbol 'rte_eal_init' not found)"] + ) LDFLAGS="$SAVE_LDFLAGS" - if test "x$FOUND_DPDK" = "xno" - then - AC_MSG_ERROR([libdpdk error: cannot link with dpdk in $DPDK_LIB_DIR]) - fi fi -# -# Note: An issue on Ubuntu 14.04 necessitates the use of -Wl,--no-as-needed: -# If you try compile with the older linker, the dpdk symbols will be undefined. -# This workaround should be removed when no longer necessary. -# -if test "x$with_libdpdk" = "xyes" -then - BUILD_WITH_DPDK_CFLAGS+="-I$DPDK_INCLUDE" - if test "x$LOCAL_DPDK_INSTALL" != "xyes" - then - BUILD_WITH_DPDK_LDFLAGS="-Wl,--no-as-needed" - else - BUILD_WITH_DPDK_LDFLAGS="-L$DPDK_LIB_DIR -Wl,--no-as-needed" - fi - AC_SUBST(BUILD_WITH_DPDK_CFLAGS) - AC_SUBST(BUILD_WITH_DPDK_LDFLAGS) - AC_SUBST(BUILD_WITH_DPDK_LIBS) -fi # }}} # --with-java {{{ @@ -2962,15 +2927,15 @@ fi if test "x$with_liblua" = "xyes" then - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $LUA_CFLAGS" + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [with_liblua="yes"], [with_liblua="no (header not found)"] ) - CFLAGS="$SAVE_CFLAGS" + CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_liblua" = "xyes" @@ -4276,6 +4241,16 @@ then fi if test "x$with_libpqos" = "xyes" then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_libpqos_cppflags" + AC_RUN_IFELSE([AC_LANG_PROGRAM( + [[#include ]], + [[return !(PQOS_VERSION >= 106)]])], + [with_libpqos="yes"], [with_libpqos="no (pqos library version 1.06 or higher is required)"]) + CPPFLAGS="$SAVE_CPPFLAGS" +fi +if test "x$with_libpqos" = "xyes" +then BUILD_WITH_LIBPQOS_CPPFLAGS="$with_libpqos_cppflags" BUILD_WITH_LIBPQOS_LDFLAGS="$with_libpqos_ldflags" BUILD_WITH_LIBPQOS_LIBS="-lpqos" @@ -5964,7 +5939,7 @@ plugin_curl_xml="no" plugin_df="no" plugin_disk="no" plugin_drbd="no" -plugin_dpdk="no" +plugin_dpdkstat="no" plugin_entropy="no" plugin_ethstat="no" plugin_fhcount="no" @@ -6375,6 +6350,11 @@ then plugin_xencpu="yes" fi +if test "x$with_libdpdk" = "xyes" +then + plugin_dpdkstat="yes" +fi + m4_divert_once([HELP_ENABLE], [ collectd plugins:]) @@ -6421,7 +6401,7 @@ AC_PLUGIN([dbi], [$with_libdbi], [General database st AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) -AC_PLUGIN([dpdkstat], [$with_libdpdk], [Stats & Status from DPDK]) +AC_PLUGIN([dpdkstat], [$plugin_dpdkstat], [Stats & Status from DPDK]) AC_PLUGIN([drbd], [$plugin_drbd], [DRBD statistics]) AC_PLUGIN([email], [yes], [EMail statistics]) AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics]) @@ -6858,7 +6838,7 @@ AC_MSG_RESULT([ dbi . . . . . . . . . $enable_dbi]) AC_MSG_RESULT([ df . . . . . . . . . $enable_df]) AC_MSG_RESULT([ disk . . . . . . . . $enable_disk]) AC_MSG_RESULT([ dns . . . . . . . . . $enable_dns]) -AC_MSG_RESULT([ dpdkstat . . . . . . .$enable_dpdkstat]) +AC_MSG_RESULT([ dpdkstat . . . . . . $enable_dpdkstat]) AC_MSG_RESULT([ drbd . . . . . . . . $enable_drbd]) AC_MSG_RESULT([ email . . . . . . . . $enable_email]) AC_MSG_RESULT([ entropy . . . . . . . $enable_entropy])