diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 03c36ccbc2..8824bf2af7 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c46db7c2e1f63ec525835553587e70c635565310 Mon Sep 17 00:00:00 2001 | 1 | From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 | 3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 |
4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink | 4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink |
@@ -10,12 +10,13 @@ Upstream-Status: Pending | |||
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
13 | |||
13 | --- | 14 | --- |
14 | configure.ac | 10 +++++++--- | 15 | configure.ac | 10 +++++++--- |
15 | 1 file changed, 7 insertions(+), 3 deletions(-) | 16 | 1 file changed, 7 insertions(+), 3 deletions(-) |
16 | 17 | ||
17 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
18 | index eda7871..03ddc50 100644 | 19 | index d99fa3b..d607772 100644 |
19 | --- a/configure.ac | 20 | --- a/configure.ac |
20 | +++ b/configure.ac | 21 | +++ b/configure.ac |
21 | @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], | 22 | @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], |
@@ -28,9 +29,9 @@ index eda7871..03ddc50 100644 | |||
28 | AC_ARG_ENABLE([connlabel], | 29 | AC_ARG_ENABLE([connlabel], |
29 | AS_HELP_STRING([--disable-connlabel], | 30 | AS_HELP_STRING([--disable-connlabel], |
30 | [Do not build libnetfilter_conntrack]), | 31 | [Do not build libnetfilter_conntrack]), |
31 | @@ -115,9 +118,10 @@ if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then | 32 | @@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) |
32 | AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) | 33 | AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"]) |
33 | fi | 34 | AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) |
34 | 35 | ||
35 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], | 36 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], |
36 | - [nfnetlink=1], [nfnetlink=0]) | 37 | - [nfnetlink=1], [nfnetlink=0]) |
@@ -40,8 +41,5 @@ index eda7871..03ddc50 100644 | |||
40 | + ]) | 41 | + ]) |
41 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) | 42 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) |
42 | 43 | ||
43 | if test "x$enable_nftables" = "xyes"; then | 44 | if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then |
44 | PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0]) | 45 | PKG_CHECK_MODULES([libpcap], [libpcap], [], [ |
45 | -- | ||
46 | 2.4.0 | ||
47 | |||