blob: 03c36ccbc2c0eb0cf71c38e6f9c0f1abc2c3e19b [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From c46db7c2e1f63ec525835553587e70c635565310 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 21 Feb 2017 11:16:31 +0200
4Subject: [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>
13---
Brad Bishop6e60e8b2018-02-01 10:27:11 -050014 configure.ac | 10 +++++++---
15 1 file changed, 7 insertions(+), 3 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index eda7871..03ddc50 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022 AC_ARG_ENABLE([nftables],
23 AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]),
24 [enable_nftables="$enableval"], [enable_nftables="yes"])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050025+AC_ARG_ENABLE([libnfnetlink],
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050026+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
27+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
Brad Bishop6e60e8b2018-02-01 10:27:11 -050028 AC_ARG_ENABLE([connlabel],
29 AS_HELP_STRING([--disable-connlabel],
30 [Do not build libnetfilter_conntrack]),
31@@ -115,9 +118,10 @@ if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050032 AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool))
33 fi
Patrick Williamsc124f4f2015-09-15 14:41:29 -050034
35-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
36- [nfnetlink=1], [nfnetlink=0])
37-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
38+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050039+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
40+ ])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050041+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
42
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050043 if test "x$enable_nftables" = "xyes"; then
44 PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0])
Brad Bishop6e60e8b2018-02-01 10:27:11 -050045--
462.4.0
47