From 38ee0c7834f5b3bfbd507f305a5c8d83546473eb Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 9 Apr 2019 17:24:59 +0200
Subject: [PATCH] build: disable eBPF by default

We have random failures to build on gitlab-ci. Something is wrong,
at least, eBPF is not working reliably. Disable it for now.

(cherry picked from commit 52ea426b81e758819beb7850a590058f740706ab)
---
 configure.ac | 3 ++-
 meson.build  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 869bd1013f..78005d3dea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -529,7 +529,8 @@ esac
 AC_ARG_WITH(ebpf,
             AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support (default: auto)]),
             [], [with_ebpf=auto])
-if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then
+# 'auto' means 'false' because there are still some issues.
+if test "$with_ebpf" = "yes" ; then
 	AC_CHECK_HEADER(linux/bpf.h, [have_ebpf=yes], [have_ebpf=no])
 else
 	have_ebpf=no
diff --git a/meson.build b/meson.build
index f0e535c34c..b8e248c482 100644
--- a/meson.build
+++ b/meson.build
@@ -437,7 +437,8 @@ config_h.set10('HAVE_SELINUX', enable_selinux)
 
 # eBPF support
 ebpf_opt = get_option('ebpf')
-if ebpf_opt == 'false'
+# 'auto' means 'false', because there are still issues.
+if ebpf_opt != 'true'
   enable_ebpf = false
 else
   enable_ebpf = true