From 9df60f314d804763a2cc4dcb0065457ff32de628 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 21 Nov 2017 22:32:31 +0000 Subject: [PATCH] Simplify union bpf_attr field checks * configure.ac: Use AC_CHECK_MEMBERS instead of st_CHECK_UNION_BPF_ATTR for union bpf_attr field checks as the former seems to be enough for the case. * m4/st_bpf.m4: Remove. --- configure.ac | 16 +++++++++------- m4/st_bpf.m4 | 50 -------------------------------------------------- 2 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 m4/st_bpf.m4 diff --git a/configure.ac b/configure.ac index 4fab3b1f..0f74fe18 100644 --- a/configure.ac +++ b/configure.ac @@ -459,13 +459,15 @@ AC_CHECK_HEADERS([linux/input.h], [ ]) AC_CHECK_HEADERS([linux/bpf.h], [ - st_CHECK_UNION_BPF_ATTR([attach_flags]) - st_CHECK_UNION_BPF_ATTR([bpf_fd]) - st_CHECK_UNION_BPF_ATTR([flags]) - st_CHECK_UNION_BPF_ATTR([next_id]) - st_CHECK_UNION_BPF_ATTR([numa_node]) - st_CHECK_UNION_BPF_ATTR([prog_flags]) - AC_CHECK_MEMBERS([union bpf_attr.test.duration],,, [#include ]) + AC_CHECK_MEMBERS(m4_normalize([ + union bpf_attr.attach_flags, + union bpf_attr.bpf_fd, + union bpf_attr.flags, + union bpf_attr.next_id, + union bpf_attr.numa_node, + union bpf_attr.prog_flags, + union bpf_attr.test.duration + ]),,, [#include ]) ]) AC_CHECK_TYPES(m4_normalize([ diff --git a/m4/st_bpf.m4 b/m4/st_bpf.m4 deleted file mode 100644 index ae44d287..00000000 --- a/m4/st_bpf.m4 +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/m4 -# -# Copyright (c) 2015-2017 Dmitry V. Levin -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -AC_DEFUN([st_CHECK_UNION_BPF_ATTR],[ - -pushdef([ATTR_NAME], translit([$1], [a-z], [A-Z])) -pushdef([attr_text], [union bpf_attr.][$1]) -pushdef([have_attr], [st_cv_member_union_bpf_attr_][$1]) - -AC_CACHE_CHECK([whether attr_text initialization works], - [have_attr], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [union bpf_attr a = { .$1 = 0 };])], - [have_attr=yes], - [have_attr=no])]) - -if test $have_attr = yes; then - AC_DEFINE([HAVE_UNION_BPF_ATTR_]ATTR_NAME, [1], - [Define to 1 if attr_text initialization works]) -fi - -popdef([have_attr]) -popdef([attr_text]) -popdef([ATTR_NAME]) -]) -- 2.40.0