summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJafar Al-Gharaibeh <Jafaral@users.noreply.github.com>2021-09-16 14:55:43 -0500
committerGitHub <noreply@github.com>2021-09-16 14:55:43 -0500
commit7c3ea1c4240d5aeddf11f20d45aa1551526b44e2 (patch)
treea322de81708e063cc0baa410c469e8508bc14d04
parent68a8bd50d415e6f44b810a3ad21d646c7fb10da4 (diff)
parentc038cddff879fd509cddec0b52c6c2e7d20fed5c (diff)
Merge pull request #9619 from AnuradhaKaruppiah/lttng-updates
lttng build updates
-rw-r--r--configure.ac2
-rw-r--r--tests/subdir.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 917e791182..2897cfef66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ dnl -----
dnl LTTng
dnl -----
if test "$enable_lttng" = "yes"; then
- PKG_CHECK_MODULES([UST], [lttng-ust >= 2.12.0], [
+ PKG_CHECK_MODULES([UST], [lttng-ust >= 2.10.0], [
AC_DEFINE([HAVE_LTTNG], [1], [Enable LTTng support])
LTTNG=true
], [
diff --git a/tests/subdir.am b/tests/subdir.am
index b0be63c695..1edfda9bc2 100644
--- a/tests/subdir.am
+++ b/tests/subdir.am
@@ -183,7 +183,7 @@ TESTS_CXXFLAGS = \
# note no -Werror
ALL_TESTS_LDADD = lib/libfrr.la $(LIBCAP)
-BGP_TEST_LDADD = bgpd/libbgp.a $(RFPLDADD) $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
+BGP_TEST_LDADD = bgpd/libbgp.a $(RFPLDADD) $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) $(UST_LIBS) -lm
ISISD_TEST_LDADD = isisd/libisis.a $(ALL_TESTS_LDADD)
if GRPC
GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm