From: Philipp Stephani <phst@google.com>
Date: Sun, 11 Apr 2021 10:26:13 +0000 (+0200)
Subject: Add another check for the required header <linux/filter.h>.
X-Git-Tag: emacs-28.0.90~2914
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0334fa0532e63f22486b5142fa399decf54b18c0;p=emacs.git

Add another check for the required header <linux/filter.h>.

* configure.ac: Also check for <linux/filter.h>.
* src/emacs.c (SECCOMP_USABLE): Also check for <linux/filter.h>.
---

diff --git a/configure.ac b/configure.ac
index be623c96548..cb4a9ab2876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4181,7 +4181,7 @@ AC_SUBST([LIBS_MAIL])
 
 HAVE_SECCOMP=no
 AC_CHECK_HEADERS(
-  [linux/seccomp.h],
+  [linux/seccomp.h linux/filter.h],
   [AC_CHECK_DECLS(
     [SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC],
     [HAVE_SECCOMP=yes], [],
diff --git a/src/emacs.c b/src/emacs.c
index bd01d7bb461..694d975ec3d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -61,8 +61,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 # include <sys/socket.h>
 #endif
 
-#if defined HAVE_LINUX_SECCOMP_H       \
-  && HAVE_DECL_SECCOMP_SET_MODE_FILTER \
+#if defined HAVE_LINUX_SECCOMP_H && defined HAVE_LINUX_FILTER_H \
+  && HAVE_DECL_SECCOMP_SET_MODE_FILTER                          \
   && HAVE_DECL_SECCOMP_FILTER_FLAG_TSYNC
 # define SECCOMP_USABLE 1
 #else