X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=ba3687a50c1ec8604a71e04478146c7aca6e95aa;hb=ba76b1429d2b11935602aaf85174fa6058325d0f;hp=62de3ecd28b868891496fca77e90238d6b04a180;hpb=7b64cc91d3307179557b25b6ece2349a088f4294;p=collectd.git diff --git a/configure.ac b/configure.ac index 62de3ecd..ba3687a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1621,18 +1621,32 @@ AC_CHECK_LIB(resolv, res_search, AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") dnl Check for HAL (hardware abstraction library) -with_libhal="yes" -AC_CHECK_LIB(hal,libhal_device_property_exists, - [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])], - [with_libhal="no"]) -if test "x$with_libhal" = "xyes"; then - if test "x$PKG_CONFIG" != "x"; then - BUILD_WITH_LIBHAL_CFLAGS="`$PKG_CONFIG --cflags hal`" - BUILD_WITH_LIBHAL_LIBS="`$PKG_CONFIG --libs hal`" - AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) - AC_SUBST(BUILD_WITH_LIBHAL_LIBS) - fi -fi +with_libhal="no" +PKG_CHECK_MODULES([HAL], [hal], + [ + SAVE_LIBS="$LIBS" + LIBS="$HAL_LIBS $LIBS" + AC_CHECK_LIB([hal], [libhal_device_property_exists], + [ + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$HAL_CFLAGS $CPPFLAGS" + AC_CHECK_HEADERS([libhal.h], + [ + with_libhal="yes" + BUILD_WITH_LIBHAL_CFLAGS="$HAL_CFLAGS" + BUILD_WITH_LIBHAL_LIBS="$HAL_LIBS" + ]) + CPPFLAGS="$SAVE_CPPFLAGS" + ], + [ : ] + ) + LIBS="$SAVE_LIBS" + ], + [ : ] +) +AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) +AC_SUBST(BUILD_WITH_LIBHAL_LIBS) + SAVE_LIBS="$LIBS" AC_CHECK_LIB([pthread], @@ -2397,6 +2411,65 @@ then 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 + with_dpdk_path="$withval" + with_libdpdk="yes" + else + if test "x$withval" = "xno" + then + with_libdpdk="no (disabled)" + fi + fi +], [with_libdpdk="no"]) + +if test "x$with_libdpdk" = "xyes" +then + RTE_BUILD="$with_dpdk_path" + DPDK_INCLUDE="$RTE_BUILD/include/dpdk" + DPDK_LIB_DIR="$RTE_BUILD/lib" + DPDK_LIB="-ldpdk" + + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$DPDK_LIB_DIR" + CFLAGS="$CFLAGS -I$DPDK_INCLUDE" + FOUND_DPDK=false + SAVE_LIBS="$LIBS" + LIBS="$LIBS $DPDK_LIB" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( +[[ +#include +#include +]], +[[ +int rte_argc; +char ** rte_argv; +rte_eal_init(rte_argc, rte_argv); +]] + )], + [FOUND_DPDK=true]) + CFLAGS="$SAVE_CFLAGS" + LDFLAGS="$SAVE_LDFLAGS" + LIBS="$SAVE_LIBS" + if test "x$FOUND_DPDK" != "xtrue" + then + AC_MSG_ERROR([cannot link with dpdk]) + fi + DPDK_LDFLAGS="-ldpdk" + BUILD_WITH_DPDK_CFLAGS="-I$DPDK_INCLUDE" + BUILD_WITH_DPDK_LDFLAGS="-L$DPDK_LIB_DIR" + BUILD_WITH_DPDK_LIBS="$DPDK_LDFLAGS" + AC_SUBST(BUILD_WITH_DPDK_CFLAGS) + AC_SUBST(BUILD_WITH_DPDK_LDFLAGS) + AC_SUBST(BUILD_WITH_DPDK_LIBS) +fi +# }}} + # --with-java {{{ with_java_home="$JAVA_HOME" if test "x$with_java_home" = "x" @@ -4872,6 +4945,7 @@ then AC_SUBST(LIBXENCTL_CPPFLAGS) AC_SUBST(LIBXENCTL_LDFLAGS) fi +# }}} # --with-libxmms {{{ with_xmms_config="xmms-config" @@ -5541,6 +5615,7 @@ plugin_curl_xml="no" plugin_df="no" plugin_disk="no" plugin_drbd="no" +plugin_dpdk="no" plugin_entropy="no" plugin_ethstat="no" plugin_fhcount="no" @@ -5959,6 +6034,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([drbd], [$plugin_drbd], [DRBD statistics]) AC_PLUGIN([email], [yes], [EMail statistics]) AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics]) @@ -6262,232 +6338,232 @@ then with_perl_bindings="yes ($PERL_BINDINGS_OPTIONS)" fi -cat <