blob: 8824bf2af7ef5657261ec91f2c46e83504932b3b [file] [log] [blame]
Patrick Williamsda295312023-12-05 16:48:56 -06001From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 21 Feb 2017 11:16:31 +0200
Patrick Williamsda295312023-12-05 16:48:56 -06004Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
Patrick Williamsc124f4f2015-09-15 14:41:29 -05005
6This changes the configure behaviour from autodetecting
7for libnfnetlink to having an option to disable it explicitly
8
Patrick Williamsc124f4f2015-09-15 14:41:29 -05009Upstream-Status: Pending
Patrick Williamsc124f4f2015-09-15 14:41:29 -050010
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050011Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
Patrick Williamsda295312023-12-05 16:48:56 -060013
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050014---
Brad Bishop6e60e8b2018-02-01 10:27:11 -050015 configure.ac | 10 +++++++---
16 1 file changed, 7 insertions(+), 3 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
Patrick Williamsda295312023-12-05 16:48:56 -060019index d99fa3b..d607772 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050020--- a/configure.ac
21+++ b/configure.ac
22@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050023 AC_ARG_ENABLE([nftables],
24 AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]),
25 [enable_nftables="$enableval"], [enable_nftables="yes"])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050026+AC_ARG_ENABLE([libnfnetlink],
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050027+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
28+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029 AC_ARG_ENABLE([connlabel],
30 AS_HELP_STRING([--disable-connlabel],
31 [Do not build libnetfilter_conntrack]),
Patrick Williamsda295312023-12-05 16:48:56 -060032@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
33 AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
34 AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050035
36-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
37- [nfnetlink=1], [nfnetlink=0])
38-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
39+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050040+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
41+ ])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050042+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
43
Patrick Williamsda295312023-12-05 16:48:56 -060044 if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
45 PKG_CHECK_MODULES([libpcap], [libpcap], [], [