From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 27 Nov 2019 19:23:56 +0000 (-0500)
Subject: Fix build: fd-tracker is not part of librelayd
X-Git-Tag: v2.12.0-rc1~176
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=aa360a35847ac1274e22858554fb89203318e372;p=lttng-tools.git

Fix build: fd-tracker is not part of librelayd

The fd-tracker library is not part of the internal librelayd; it is
its own stand-alone library.

Add an autoconf conditional to build libfd-tracker by default
and require it when building the relay daemon.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I40934eeaa62e61f5da4508c1f2c91daaa9e57829
---

diff --git a/configure.ac b/configure.ac
index ec5d72ec4..c60e96715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -866,6 +866,7 @@ build_lib_kernel_consumer=no
 build_lib_kernel_ctl=no
 build_lib_lttng_ctl=no
 build_lib_relayd=no
+build_lib_fd_tracker=no
 build_lib_sessiond_comm=no
 build_lib_testpoint=no
 build_lib_ust_consumer=no
@@ -905,6 +906,7 @@ AS_IF([test x$enable_bin_lttng_relayd != xno],
        build_lib_index=yes
        build_lib_health=yes
        build_lib_testpoint=yes
+       build_lib_fd_tracker=yes
       ]
 )
 AS_IF([test x$enable_bin_lttng_sessiond != xno],
@@ -1030,6 +1032,7 @@ AM_CONDITIONAL([BUILD_LIB_KERNEL_CONSUMER], [test x$build_lib_kernel_consumer =
 AM_CONDITIONAL([BUILD_LIB_KERNEL_CTL], [test x$build_lib_kernel_ctl = xyes])
 AM_CONDITIONAL([BUILD_LIB_LTTNG_CTL], [test x$build_lib_lttng_ctl = xyes])
 AM_CONDITIONAL([BUILD_LIB_RELAYD], [test x$build_lib_relayd = xyes])
+AM_CONDITIONAL([BUILD_LIB_FD_TRACKER], [test x$build_lib_fd_tracker = xyes])
 AM_CONDITIONAL([BUILD_LIB_SESSIOND_COMM], [test x$build_lib_sessiond_comm = xyes])
 AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes])
 AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes])
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 437bcd812..a40ec0d29 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -95,7 +95,11 @@ SUBDIRS += sessiond-comm
 endif
 
 if BUILD_LIB_RELAYD
-SUBDIRS += relayd fd-tracker
+SUBDIRS += relayd
+endif
+
+if BUILD_LIB_FD_TRACKER
+SUBDIRS += fd-tracker
 endif
 
 if BUILD_LIB_KERNEL_CONSUMER