Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 1 | From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
| 3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
| 6 | This changes the configure behaviour from autodetecting |
| 7 | for libnfnetlink to having an option to disable it explicitly |
| 8 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9 | Upstream-Status: Pending |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 13 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 14 | --- |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 15 | configure.ac | 10 +++++++--- |
| 16 | 1 file changed, 7 insertions(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.ac b/configure.ac |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 19 | index d99fa3b..d607772 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
| 22 | @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 23 | AC_ARG_ENABLE([nftables], |
| 24 | AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]), |
| 25 | [enable_nftables="$enableval"], [enable_nftables="yes"]) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 26 | +AC_ARG_ENABLE([libnfnetlink], |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 27 | + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), |
| 28 | + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 29 | AC_ARG_ENABLE([connlabel], |
| 30 | AS_HELP_STRING([--disable-connlabel], |
| 31 | [Do not build libnetfilter_conntrack]), |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 32 | @@ -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 Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 35 | |
| 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 Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 40 | + PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) |
| 41 | + ]) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 42 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) |
| 43 | |
Patrick Williams | da29531 | 2023-12-05 16:48:56 -0600 | [diff] [blame^] | 44 | if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then |
| 45 | PKG_CHECK_MODULES([libpcap], [libpcap], [], [ |