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