Merge branch 'collectd-5.6' into collectd-5.7

[collectd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7f0dd5c..366ef9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -835,12 +835,12 @@ AC_CHECK_HEADERS(sys/capability.h,
                  [have_capability="yes"],
                  [have_capability="no (<sys/capability.h> 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_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,8 +2606,6 @@ fi
 # }}}
 
 # --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])
 
@@ -2615,6 +2613,10 @@ AC_ARG_WITH([libdpdk], [AS_HELP_STRING([--without-libdpdk], [Disable libdpdk.])]
 
 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],
@@ -2629,7 +2631,7 @@ then
        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"
@@ -4233,6 +4235,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 <pqos.h>]],
+    [[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"
@@ -6332,7 +6344,7 @@ then
   plugin_xencpu="yes"
 fi
 
-if test "x$with_libdpkd" = "xyes"
+if test "x$with_libdpdk" = "xyes"
 then
   plugin_dpdkstat="yes"
 fi