|
 |
716360 |
From 113ed506dc85e5c8c6f1a9971583e1a8656ba0ae Mon Sep 17 00:00:00 2001
|
|
|
716360 |
From: Ash Hughes <sehguh.hsa@gmail.com>
|
|
|
716360 |
Date: Mon, 27 May 2019 21:59:23 +0100
|
|
|
716360 |
Subject: [PATCH] conntrackd: search for RPC headers
|
|
|
716360 |
|
|
|
716360 |
Attempts to get RPC headers from libtirpc if they aren't otherwise
|
|
|
716360 |
available.
|
|
|
716360 |
|
|
|
716360 |
Signed-off-by: Ash Hughes <sehguh.hsa@gmail.com>
|
|
|
716360 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
716360 |
(cherry picked from commit 5ededc4476f27e74f49f37ce646dabc1def7d4dc)
|
|
|
716360 |
---
|
|
|
716360 |
configure.ac | 2 ++
|
|
|
716360 |
src/helpers/Makefile.am | 2 +-
|
|
|
716360 |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
716360 |
|
|
|
716360 |
diff --git a/configure.ac b/configure.ac
|
|
|
716360 |
index 048d261ac1088..cb9659f4feeb4 100644
|
|
|
716360 |
--- a/configure.ac
|
|
|
716360 |
+++ b/configure.ac
|
|
|
716360 |
@@ -50,6 +50,8 @@ AC_ARG_ENABLE([systemd],
|
|
|
716360 |
AS_HELP_STRING([--enable-systemd], [Build systemd support]),
|
|
|
716360 |
[enable_systemd="$enableval"], [enable_systemd="no"])
|
|
|
716360 |
|
|
|
716360 |
+AC_CHECK_HEADER([rpc/rpc_msg.h], [AC_SUBST([LIBTIRPC_CFLAGS],'')], [PKG_CHECK_MODULES([LIBTIRPC], [libtirpc])])
|
|
|
716360 |
+
|
|
|
716360 |
PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
|
|
|
716360 |
PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
|
|
|
716360 |
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.7])
|
|
|
716360 |
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
|
|
|
716360 |
index 05801bc7f7037..51e2841a7646a 100644
|
|
|
716360 |
--- a/src/helpers/Makefile.am
|
|
|
716360 |
+++ b/src/helpers/Makefile.am
|
|
|
716360 |
@@ -31,7 +31,7 @@ ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
|
|
|
716360 |
|
|
|
716360 |
ct_helper_rpc_la_SOURCES = rpc.c
|
|
|
716360 |
ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
|
|
|
716360 |
-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS)
|
|
|
716360 |
+ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) @LIBTIRPC_CFLAGS@
|
|
|
716360 |
|
|
|
716360 |
ct_helper_tftp_la_SOURCES = tftp.c
|
|
|
716360 |
ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
|
|
|
716360 |
--
|
|
|
716360 |
2.34.1
|
|
|
716360 |
|