* [iptables][PATCHv2] configure: Add option to enable/disable libnfnetlink
@ 2024-04-25 8:51 Alexander Kanavin
2024-04-25 11:27 ` Phil Sutter
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Kanavin @ 2024-04-25 8:51 UTC (permalink / raw)
To: phil, netfilter-devel
From: "Maxin B. John" <maxin.john@intel.com>
Default behavior (autodetecting) does not change, but specifying
either option would explicitly disable or enable libnfnetlink support,
and if the library is not found in the latter case, ./configure will error
out.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
configure.ac | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d99fa3b9..c9194da0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
AC_ARG_ENABLE([nftables],
AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]),
[enable_nftables="$enableval"], [enable_nftables="yes"])
+AC_ARG_ENABLE([libnfnetlink],
+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"])
AC_ARG_ENABLE([connlabel],
AS_HELP_STRING([--disable-connlabel],
[Do not build libnetfilter_conntrack]),
@@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
- [nfnetlink=1], [nfnetlink=0])
+# If specified explicitly on the command line, error out when library was not found
+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], [nfnetlink=1])
+ ])
+# Otherwise, disable and continue
+AS_IF([test "x$enable_libnfnetlink" = "xauto"], [
+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], [nfnetlink=1], [nfnetlink=0])
+ ])
AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [iptables][PATCHv2] configure: Add option to enable/disable libnfnetlink
2024-04-25 8:51 [iptables][PATCHv2] configure: Add option to enable/disable libnfnetlink Alexander Kanavin
@ 2024-04-25 11:27 ` Phil Sutter
0 siblings, 0 replies; 2+ messages in thread
From: Phil Sutter @ 2024-04-25 11:27 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: netfilter-devel
On Thu, Apr 25, 2024 at 10:51:02AM +0200, Alexander Kanavin wrote:
> From: "Maxin B. John" <maxin.john@intel.com>
>
> Default behavior (autodetecting) does not change, but specifying
> either option would explicitly disable or enable libnfnetlink support,
> and if the library is not found in the latter case, ./configure will error
> out.
Thanks for following up! I applied the patch after merging the two
AS_IF() calls: AS_IF supports building "else if"-like chains of
conditions.
Cheers, Phil
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-25 11:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-25 8:51 [iptables][PATCHv2] configure: Add option to enable/disable libnfnetlink Alexander Kanavin
2024-04-25 11:27 ` Phil Sutter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).