dnsdist: Better detection of libbpf and libxdp

diff --git a/pdns/dnsdistdist/m4/pdns_with_xsk.m4 b/pdns/dnsdistdist/m4/pdns_with_xsk.m4
index b45c9f30f1ce942d1594aa7fe4866e9422a1995a..a5f61dd5249e90a261e226cf727af8aabdaa3ab2 100644 (file)
--- a/pdns/dnsdistdist/m4/pdns_with_xsk.m4
+++ b/pdns/dnsdistdist/m4/pdns_with_xsk.m4
@@ -1,7 +1,7 @@
 AC_DEFUN([PDNS_WITH_XSK],[
-  AC_MSG_CHECKING([if we have xsk support])
+  AC_MSG_CHECKING([if we have AF_XDP (XSK) support])
   AC_ARG_WITH([xsk],
-    AS_HELP_STRING([--with-xsk],[enable xsk support @<:@default=auto@:>@]),
+    AS_HELP_STRING([--with-xsk],[enable AF_XDP (XDK) support @<:@default=auto@:>@]),
     [with_xsk=$withval],
     [with_xsk=auto],
   )
@@ -9,14 +9,18 @@ AC_DEFUN([PDNS_WITH_XSK],[
 
   AS_IF([test "x$with_xsk" != "xno"], [
     AS_IF([test "x$with_xsk" = "xyes" -o "x$with_xsk" = "xauto"], [
-      AC_CHECK_HEADERS([xdp/xsk.h], xsk_headers=yes, xsk_headers=no)
+      PKG_CHECK_MODULES([XDP], [libxdp], [
+        AC_DEFINE([HAVE_XDP], [1], [Define to 1 if you have the XDP library])
+      ], [:])
+      PKG_CHECK_MODULES([BPF], [libbpf], [
+        AC_DEFINE([HAVE_BPF], [1], [Define to 1 if you have the BPF library])
+      ], [:])
     ])
   ])
+  AM_CONDITIONAL([HAVE_XSK], [test x"$BPF_LIBS" != "x" -a x"$XDP_LIBS" != "x"])
   AS_IF([test "x$with_xsk" = "xyes"], [
-    AS_IF([test x"$xsk_headers" = "no"], [
-      AC_MSG_ERROR([XSK support requested but required libxdp were not found])
+    AS_IF([test x"$BPF_LIBS" = "x" -o x"$XDP_LIBS" = "x" ], [
+      AC_MSG_ERROR([AF_XDP (XSK) support requested but required libbpf and/or libxdp were not found])
     ])
   ])
-  AS_IF([test x"$xsk_headers" = "xyes" ], [ AC_DEFINE([HAVE_XSK], [1], [Define if using eBPF.]) ])
-  AM_CONDITIONAL([HAVE_XSK], [test x"$xsk_headers" = "xyes" ])
 ])