blob: b711b7aa369445109694cfa84917b340b50711da [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05001[PATCH] configure: Add option to enable/disable libnfnetlink
Patrick Williamsc124f4f2015-09-15 14:41:29 -05002
3This changes the configure behaviour from autodetecting
4for libnfnetlink to having an option to disable it explicitly
5
Patrick Williamsc124f4f2015-09-15 14:41:29 -05006Upstream-Status: Pending
Patrick Williamsc124f4f2015-09-15 14:41:29 -05007
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05008Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Maxin B. John <maxin.john@intel.com>
10---
11diff -Naur iptables-1.6.0-old/configure.ac iptables-1.6.0/configure.ac
12--- iptables-1.6.0-old/configure.ac 2015-12-28 18:40:35.255417976 +0200
13+++ iptables-1.6.0/configure.ac 2015-12-29 13:01:12.388840200 +0200
14@@ -63,6 +63,9 @@
15 AC_ARG_ENABLE([nftables],
16 AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]),
17 [enable_nftables="$enableval"], [enable_nftables="yes"])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050018+AC_ARG_ENABLE([libnfnetlink],
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050019+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
20+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050021
22 libiptc_LDFLAGS2="";
23 AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed],
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050024@@ -123,9 +126,10 @@
25 AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool))
26 fi
Patrick Williamsc124f4f2015-09-15 14:41:29 -050027
28-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
29- [nfnetlink=1], [nfnetlink=0])
30-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
31+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050032+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
33+ ])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050034+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
35
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050036 if test "x$enable_nftables" = "xyes"; then
37 PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0])