From patchwork Sat Oct 9 11:38:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538763 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=Kn3Uh9BS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTP1Djlz9t0T for ; Sat, 9 Oct 2021 22:42:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232953AbhJILo1 (ORCPT ); Sat, 9 Oct 2021 07:44:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232408AbhJILoZ (ORCPT ); Sat, 9 Oct 2021 07:44:25 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F11E2C061755 for ; Sat, 9 Oct 2021 04:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=4lG9ERdarqNJisZvubsaNdjwjE6buchMCodRhqLdwrY=; b=Kn3Uh9BS8J4CKeNVZczg13yTNI 9vJPycFQGVfiHu+o0mgaMWouS7ClPsz7KlsVboGm3Cuic6U3g7Dadh2HumQCiEYzbObS05ogzKyxb oaj2mCKZkG1Wsxlu4/Ydwrph5DvgizpoywINaAibQUPF2LnkZx13TTvdxuRflJXY8QG3j8RSbV+U0 xImE3Mh12iNJZkcY1QHlHLeu6MBvlo9KbpZgOW6SWZu5L+FvHgPNDogEz8X7EC+cHkTqrKEtVouRn 3L2nW9jfwnJtFlaHWnHQWkSpjECSGMIHfhHTBdCObkOQOVCFyjmGX40fW7/5VfBpKL+ukifrgf+j8 rdYakrtg==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-65 for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 1/9] build: correct pkg-config dependency configuration Date: Sat, 9 Oct 2021 12:38:31 +0100 Message-Id: <20211009113839.2765382-2-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Put libnfnetlink and libmnl in `Requires.private`. They both use pkg-config (thus `Requires`, not `Libs`), and they are both required for static builds, but do not need to be exposed otherwise (thus `Requires.private`). Signed-off-by: Jeremy Sowden --- configure.ac | 7 +++++-- libnetfilter_log.pc.in | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index c914e00a8ffe..8360e91063ae 100644 --- a/configure.ac +++ b/configure.ac @@ -29,8 +29,11 @@ AC_ARG_WITH([ipulog], AM_CONDITIONAL([BUILD_IPULOG], [test "x$with_ipulog" != xno]) dnl Dependencies -PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41]) -PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) +AC_SUBST([LIBNFNETLINK_MIN_VERSION], [0.0.41]) +AC_SUBST([LIBMNL_MIN_VERSION], [1.0.3]) + +PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= ${LIBNFNETLINK_MIN_VERSION}]) +PKG_CHECK_MODULES([LIBMNL], [libmnl >= ${LIBMNL_MIN_VERSION}]) PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2], [HAVE_LNFCT=1], [HAVE_LNFCT=0]) AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1]) diff --git a/libnetfilter_log.pc.in b/libnetfilter_log.pc.in index a4b2f3bd4f70..9dbed7709632 100644 --- a/libnetfilter_log.pc.in +++ b/libnetfilter_log.pc.in @@ -6,11 +6,11 @@ libdir=@libdir@ includedir=@includedir@ Name: libnetfilter_log -Description: netfilter userspace packet logging library +Description: Netfilter userspace packet logging library URL: http://netfilter.org/projects/libnetfilter_log/ Version: @VERSION@ -Requires: libnfnetlink +Requires.private: libnfnetlink >= @LIBNFNETLINK_MIN_VERSION@, + libmnl >= @LIBMNL_MIN_VERSION@ Conflicts: Libs: -L${libdir} -lnetfilter_log -Libs.private: @LIBNFNETLINK_LIBS@ Cflags: -I${includedir} From patchwork Sat Oct 9 11:38:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538762 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=oh/6JYFb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTN5CY6z9t0J for ; Sat, 9 Oct 2021 22:42:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232949AbhJILo0 (ORCPT ); Sat, 9 Oct 2021 07:44:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232779AbhJILoZ (ORCPT ); Sat, 9 Oct 2021 07:44:25 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 112E0C061762 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vWTNFq667vXOGa35C2Ll3tlW4+k1mGVXnu3z7iM5Uto=; b=oh/6JYFb8A0+W0DKq0+0LJ+9UL QxBLI2HGl9W0MfsUNgKks9ibqiQAQk4hHU7c1OniBkIahwfqCE47CTA5kRGDfgySnHC4FNgy2y3w6 NHVA/jmCcJnGE/MmqNDYUw4CF7TQR1dsRxRdpYzJUcryeoguYr3BKFqphBptTrr2rp0ZZOb3b4RSI PgR3V4J1DxV3kDk/KrSYB6h5MZXNkPAWb4H59zsW6qWbG8KVLGxt4N1RhCDwSaHNafUMicQHYWANr AIeAj1o/6iBtDtQ4xnkfPmB4/m4cvVwirFIrXq1J4WToY5CiBjJRTEMVKTuCw8HNL6E5tqJOR4KbU ODxUV4AA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-AI for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 2/9] build: add pkg-config configuration for libipulog Date: Sat, 9 Oct 2021 12:38:32 +0100 Message-Id: <20211009113839.2765382-3-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Put libnfnetlink and libnetfilter_log in `Requires.private`. They both use pkg-config (thus `Requires`, not `Libs`), and they are both required for static builds, but do not need to be exposed otherwise (thus `Requires.private`). Signed-off-by: Jeremy Sowden --- Makefile.am | 2 +- configure.ac | 11 ++++++++--- libnetfilter_log_libipulog.pc.in | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 libnetfilter_log_libipulog.pc.in diff --git a/Makefile.am b/Makefile.am index 2a9cdd826dae..c7b86f77aee6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,4 +5,4 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = Make_global.am pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnetfilter_log.pc +pkgconfig_DATA = libnetfilter_log.pc libnetfilter_log_libipulog.pc diff --git a/configure.ac b/configure.ac index 8360e91063ae..1723426aa0c4 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,12 @@ PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2], AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1]) dnl Output the makefile -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile - include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc - doxygen.cfg]) +AC_CONFIG_FILES([Makefile + src/Makefile + include/Makefile + include/libnetfilter_log/Makefile + utils/Makefile + libnetfilter_log.pc + libnetfilter_log_libipulog.pc + doxygen.cfg]) AC_OUTPUT diff --git a/libnetfilter_log_libipulog.pc.in b/libnetfilter_log_libipulog.pc.in new file mode 100644 index 000000000000..1b7d17a0ac62 --- /dev/null +++ b/libnetfilter_log_libipulog.pc.in @@ -0,0 +1,16 @@ +# libnetfilter_log_libipulog pkg-config file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libnetfilter_log_libipulog +Description: Netfilter ULOG userspace compat library +URL: http://netfilter.org/projects/libnetfilter_log/ +Version: @VERSION@ +Requires.private: libnetfilter_log >= @VERSION@, + libnfnetlink >= @LIBNFNETLINK_MIN_VERSION@ +Conflicts: +Libs: -L${libdir} -lnetfilter_log_libipulog +Cflags: -I${includedir} From patchwork Sat Oct 9 11:38:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538764 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=dZVLUkMi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTP3qT1z9t0Y for ; Sat, 9 Oct 2021 22:42:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232960AbhJILo1 (ORCPT ); Sat, 9 Oct 2021 07:44:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232846AbhJILoZ (ORCPT ); Sat, 9 Oct 2021 07:44:25 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EB12C061764 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=PNKEP2UYH6n+LeJji5kBWr1UlH/eNmzrxz+kXRO2tYA=; b=dZVLUkMiSXRkUdb5KWx1OoMo4+ m01buNwqvUuBiImOVZASIPJuWyBC0J2NJ0LKgwstbgIa2GJzfJqs3NUJwFXrEzTRdEJgrlg5NWNaF tRuATp93KJWGqSKrXUvfzqaxrltDATExwWzvWSA1G9so4K8FOasW1PIJ6MfXJ5BVu63IDBwCCRxfK Ts+BTMfCtVJ2k2++ixX+UirHjkDac5uEF+2/zDHVjWUsW94AfjY19dAfQWhqcdsdAQGYpFkfUCKKd ia09iPQOH2VKTqxyvq74waIqGcsh5JmDjaxhJAd8y5j158ws6cPpIt8vWtxLktvMXKT4W1gUk268b 8is4/Wjw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-EL for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 3/9] build: fix linker flags for nf-log Date: Sat, 9 Oct 2021 12:38:33 +0100 Message-Id: <20211009113839.2765382-4-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Use pkg-config LIBS variable for libmnl, instead of literal `-lmnl`. Append `$(LIBNETFILTER_CONNTRACK_LIBS)` to nf_log_LDADD. Signed-off-by: Jeremy Sowden --- utils/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/Makefile.am b/utils/Makefile.am index 4afd91b0756d..39abb3e00af9 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -7,10 +7,10 @@ nfulnl_test_LDADD = ../src/libnetfilter_log.la nfulnl_test_LDFLAGS = -dynamic nf_log_SOURCES = nf-log.c -nf_log_LDADD = ../src/libnetfilter_log.la -lmnl +nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS) nf_log_LDFLAGS = -dynamic if BUILD_NFCT -nf_log_LDFLAGS += $(LIBNETFILTER_CONNTRACK_LIBS) +nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS) nf_log_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNETFILTER_CONNTRACK_CFLAGS} -DBUILD_NFCT endif From patchwork Sat Oct 9 11:38:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538765 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=sKG71GWA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTP674Fz9t0J for ; Sat, 9 Oct 2021 22:42:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232969AbhJILo2 (ORCPT ); Sat, 9 Oct 2021 07:44:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232865AbhJILoZ (ORCPT ); Sat, 9 Oct 2021 07:44:25 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34BA6C061765 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=GlWRpbY8uCjww+xjhOfk4/86XBfrkRvqD0DZ2q/yf5M=; b=sKG71GWAg9oTMyqptlBNKox1Ub Ift8mBs1F+9HrjWRUE5PQQZRI9QJev2d/l61pRNUNxVdOuHsSG5C0S4xP2elI/q0ob7fBoxmHI+Od qC/bdqfjdj+weJuHjBfqhKjKJU+IAtRnVP4sLASqwTnZ3KWYGL2F3WD0mk3MShH64YGvtY54ChMWp DYjOQyiY2CpYY72mUOCbaOgYIlYjcg7lxX5NpkR5X0RKS2IfuUEtawQZ8G13wuw24zygLtLfzc1Fd el2AH4AzxE1kyvZkRZp3yQCeE27WIukU7jz3ToieE6YrAqYuZDzoUzZIjvOSCuy7iUAor2E/ShY8i QpxQm38Q==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-Hc for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 4/9] build: move dependency CFLAGS variables out of `AM_CPPFLAGS` Date: Sat, 9 Oct 2021 12:38:34 +0100 Message-Id: <20211009113839.2765382-5-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org `${LIBNFNETLINK_CFLAGS}` and `${LIBMNL_CFLAGS}` are not required for all libraries and executables: include them only where necessary. Signed-off-by: Jeremy Sowden --- Make_global.am | 2 +- src/Makefile.am | 18 ++++++++++-------- utils/Makefile.am | 11 ++++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Make_global.am b/Make_global.am index 9bc8ea1d7f67..4d5bec913af2 100644 --- a/Make_global.am +++ b/Make_global.am @@ -1,2 +1,2 @@ -AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS} ${LIBMNL_CFLAGS} +AM_CPPFLAGS = -I${top_srcdir}/include AM_CFLAGS = -Wall diff --git a/src/Makefile.am b/src/Makefile.am index 815d9d31cfc0..203ca0c3cdc6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,16 +25,18 @@ include ${top_srcdir}/Make_global.am lib_LTLIBRARIES = libnetfilter_log.la -libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles \ - -version-info $(LIBVERSION) -libnetfilter_log_la_SOURCES = libnetfilter_log.c nlmsg.c -libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS} ${LIBMNL_LIBS} +libnetfilter_log_la_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNFNETLINK_CFLAGS} ${LIBMNL_CFLAGS} +libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles \ + -version-info $(LIBVERSION) +libnetfilter_log_la_SOURCES = libnetfilter_log.c nlmsg.c +libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS} ${LIBMNL_LIBS} if BUILD_IPULOG lib_LTLIBRARIES += libnetfilter_log_libipulog.la -libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \ - -version-info $(IPULOG_LIBVERSION) -libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la ${LIBNFNETLINK_LIBS} -libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c +libnetfilter_log_libipulog_la_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNFNETLINK_CFLAGS} +libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \ + -version-info $(IPULOG_LIBVERSION) +libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la ${LIBNFNETLINK_LIBS} +libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c endif diff --git a/utils/Makefile.am b/utils/Makefile.am index 39abb3e00af9..133b6ec550cf 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -6,12 +6,13 @@ nfulnl_test_SOURCES = nfulnl_test.c nfulnl_test_LDADD = ../src/libnetfilter_log.la nfulnl_test_LDFLAGS = -dynamic -nf_log_SOURCES = nf-log.c -nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS) -nf_log_LDFLAGS = -dynamic +nf_log_SOURCES = nf-log.c +nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS) +nf_log_LDFLAGS = -dynamic +nf_log_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMNL_CFLAGS) if BUILD_NFCT -nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS) -nf_log_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNETFILTER_CONNTRACK_CFLAGS} -DBUILD_NFCT +nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS) +nf_log_CPPFLAGS += $(LIBNETFILTER_CONNTRACK_CFLAGS) -DBUILD_NFCT endif if BUILD_IPULOG From patchwork Sat Oct 9 11:38:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538767 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=TuUVKUoI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTQ48jNz9t0T for ; Sat, 9 Oct 2021 22:42:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233000AbhJILoa (ORCPT ); Sat, 9 Oct 2021 07:44:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232889AbhJILoZ (ORCPT ); Sat, 9 Oct 2021 07:44:25 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F708C061766 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QtrW9GT5JKTS9Xop5fNUrS/ZD1S3CMr6AyRWRAxMEDg=; b=TuUVKUoIGP0KXdWixCI9ttWW73 3I23V7BMkcwJZBlBfuD8vx1nyMdPT9NpKoczFRd6O8dzNpA/8nezn3+AHHfWwHPf2BGp/eoMPb+/P lcRCzIM1X+bDZaYxAapK2mSOUANcTvmTu9aqsE+QtzLwMraj8DS/3Q7VRBPtIvZ8Cgjfi4tPUGFL8 AFgSXHXjhW9FEn7ZuuwaprGCbYH62U5uQRnOX9gzep4Gy9k7jE75+EG/iYQaBkqctW8BDsO236+bT OwMKKR8EUa6bueiuAQKsJebhFV8PC/FGv2Dfs05w4ozqYT0Fh+WH+kiNMSn00OX5HLvYI38cM1GuO cxc5DbHw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-KD for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 5/9] build: remove superfluous .la when linking ulog_test Date: Sat, 9 Oct 2021 12:38:35 +0100 Message-Id: <20211009113839.2765382-6-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Explicit linkage to libnetfilter_log is not required. Signed-off-by: Jeremy Sowden --- utils/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/Makefile.am b/utils/Makefile.am index 133b6ec550cf..7b9d479382ea 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -19,6 +19,6 @@ if BUILD_IPULOG check_PROGRAMS += ulog_test ulog_test_SOURCES = ulog_test.c -ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la +ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ulog_test_LDFLAGS = -dynamic endif From patchwork Sat Oct 9 11:38:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538768 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=dRV1euU8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTQ6V7kz9t0Y for ; Sat, 9 Oct 2021 22:42:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233006AbhJILoa (ORCPT ); Sat, 9 Oct 2021 07:44:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232907AbhJILo0 (ORCPT ); Sat, 9 Oct 2021 07:44:26 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61F33C061570 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=mpgTInp0RTyDZ+zdoHPCstp63IsqhLUGT79LRzQMuJU=; b=dRV1euU8JIMIZkRf7OJFP3EHV2 sGJt4vzPfTHpDQ7l5bHSdevuY3NSiVBu+URWfQ4eyUNF5WtwVPsk9rkyCYuTlZ7n2E+qWhGnhg79Z 0Wu72dzSWVrDh6YQ3VcbSispK3iawCOuKbdfS6P2+2LByxtOVX3hFU9Mng9Oowe76G6cXRL8AEcAZ a5r5fnAwUTR4mzszt/dDvLxITO5sxqXrijSpX7C7efMkN/olXUDZPEGjkl/LIkaqI0zk1DGDHVsnz RR3fUG3egqW0LGFw26CfCIja3XxVWL4EmhV3hVIideTQIB5kc8DVRfGBcLIFo867fabCX4B0Ehja+ AS933GIQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-My for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 6/9] build: remove `-dynamic` when linking check progs Date: Sat, 9 Oct 2021 12:38:36 +0100 Message-Id: <20211009113839.2765382-7-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The `-dynamic` flag is only meaningful for Darwin. Signed-off-by: Jeremy Sowden --- utils/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/utils/Makefile.am b/utils/Makefile.am index 7b9d479382ea..94afb26180ed 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,11 +4,9 @@ check_PROGRAMS = nfulnl_test nf-log nfulnl_test_SOURCES = nfulnl_test.c nfulnl_test_LDADD = ../src/libnetfilter_log.la -nfulnl_test_LDFLAGS = -dynamic nf_log_SOURCES = nf-log.c nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS) -nf_log_LDFLAGS = -dynamic nf_log_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMNL_CFLAGS) if BUILD_NFCT nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS) @@ -20,5 +18,4 @@ check_PROGRAMS += ulog_test ulog_test_SOURCES = ulog_test.c ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la -ulog_test_LDFLAGS = -dynamic endif From patchwork Sat Oct 9 11:38:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538766 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=IGPqEEJr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTQ1M2hz9ssP for ; Sat, 9 Oct 2021 22:42:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232981AbhJILo3 (ORCPT ); Sat, 9 Oct 2021 07:44:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232908AbhJILo0 (ORCPT ); Sat, 9 Oct 2021 07:44:26 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 720CBC061767 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=zRfDeteTJeoNUe+EXf9y/AHrwnZImBH0v3K/qVu6XbI=; b=IGPqEEJrjlmMhfoInIu4SiVnIU xQKFvnhX38J5lK/xf7Cm/z0T1jeQYoo6uGnxd4/iMWKh/KBxfBKsJNXujYZ+9yvCuD+wJtRqyXslT XXfk1LZEaaoSMB5qSwv8ah623QZUfPSx17JSpr5LU4ygW1JDgyBdYbf7GnCL/e9wuayUeOjPshI3V b+RnNGMGB+EReprOS7x58/OeSDkywXAZF0ts3KyQaHhBGkO2fd3uK99PC9cpJ+VTGS/NYaZ2jePH8 WKfreNUMxnmVAF2RBJh1lyBSsCwmGwD1FwTiFCfD7QtRQ1O0vvzzJ/wnX+W52v7STs4dPsUE8TELl TkWK6jSg==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-Pw for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 7/9] build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT` Date: Sat, 9 Oct 2021 12:38:37 +0100 Message-Id: <20211009113839.2765382-8-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org `AM_PROG_LIBTOOL` is superseded by `LT_INIT`, which also accepts options to control the defaults for creating shared or static libraries. Signed-off-by: Jeremy Sowden --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1723426aa0c4..1dc9bc7847fa 100644 --- a/configure.ac +++ b/configure.ac @@ -14,8 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC AM_PROG_CC_C_O -AC_DISABLE_STATIC -AM_PROG_LIBTOOL +LT_INIT([disable_static]) AC_PROG_INSTALL AC_PROG_LN_S From patchwork Sat Oct 9 11:38:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538769 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=TicB3Qij; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTR1jc9z9t0J for ; Sat, 9 Oct 2021 22:42:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233007AbhJILoa (ORCPT ); Sat, 9 Oct 2021 07:44:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232926AbhJILo0 (ORCPT ); Sat, 9 Oct 2021 07:44:26 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85250C061755 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=INtzN/vPTA96YTVU6E+it+cAKkILVF+OdqW0LSGaygg=; b=TicB3Qijl25ygazt5E7VsQ57Xr ab5G3g0qVDbkuzBBHWPkm6e2GwOuw4aOmo6/2gI8g7F7tOzY3nuA0wLbthBXB4Ri2TiyJrxEsGvU2 GstcLtOMuBfbhEAXbB3pjUqalONBzc6lq5asbviWwSvJ57VvdSNJjsSUaco/0MJ+lSBSBkrn42EEr jqa84X7VJYNKnrb+YiNgpqcZSj9svVnzv5BeNJjhHWCmwSlakFTo4EdAQ3U3X856MxWFWeFeT73MR L8piiSXJ5Bi/OEgGBgstvM1S7MKKFoPuryTngM/G5QcSucwLj6kspe224MeFmlP9kGzqgVXxBue/I PN2rLg3w==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-SS for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 8/9] build: replace `AC_HELP_STRING` with `AS_HELP_STRING` Date: Sat, 9 Oct 2021 12:38:38 +0100 Message-Id: <20211009113839.2765382-9-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org `AC_HELP_STRING` is obsolete and has been superseded by `AS_HELP_STRING`. Signed-off-by: Jeremy Sowden --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1dc9bc7847fa..85e49ede6f2d 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ case "$host" in esac AC_ARG_WITH([ipulog], - AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library])) + AS_HELP_STRING([--without-ipulog], [don't build libipulog compat library])) AM_CONDITIONAL([BUILD_IPULOG], [test "x$with_ipulog" != xno]) dnl Dependencies From patchwork Sat Oct 9 11:38:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1538770 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=dfafxRUW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HRNTR4Ljfz9ssP for ; Sat, 9 Oct 2021 22:42:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233008AbhJILob (ORCPT ); Sat, 9 Oct 2021 07:44:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232943AbhJILo0 (ORCPT ); Sat, 9 Oct 2021 07:44:26 -0400 Received: from kadath.azazel.net (kadath.azazel.net [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D982C061762 for ; Sat, 9 Oct 2021 04:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Be4ciGR79VoVtSzOL/lEh7mIEJT3WqBXVxVns86WtXk=; b=dfafxRUW4PUTsrPUx9Wn1Ejpd5 z6EYJ2q8qSJHH55z/Lb0rJqTpn/B12nluOBU7MsO4kde8mqMBleW+IkZ3kEtBWKfoHah+voD65w30 zUzWsez9cSdwXjv+YYdgJeaoPCCAVHhncjfC6c3lwDXjgAEvM+p09XUn7fGZwMzAJXH36q4C+q4EZ NdEK3xylprRN3TkdcepcRzFscXOyqZdGbkZ42CULIHLu3pPPs+N05aOMW6xLocysTtnwGD0+quC6v lJf12+Ok8+4WQVoou4wNITF3JyPJp7cS+i76ZIyPMo20yMSyc+n0TglcngE9DIjuLt8enb1ZrA45B bERBPAbg==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mZAkF-00BfRm-VF for netfilter-devel@vger.kernel.org; Sat, 09 Oct 2021 12:42:27 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnetfilter_log PATCH 9/9] Add Emacs artefacts to .gitignore Date: Sat, 9 Oct 2021 12:38:39 +0100 Message-Id: <20211009113839.2765382-10-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211009113839.2765382-1-jeremy@azazel.net> References: <20211009113839.2765382-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Jeremy Sowden --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 5eaabe38a514..ef6bb0ffdfa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +*~ +.\#* +\#*\# .deps/ .libs/ Makefile