From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 23 Oct 2019 15:08:34 +0000 (-0400)
Subject: Fix: check for lttng-ust >= 2.11 at configure
X-Git-Tag: v2.12.0-rc1~277
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=df0b021fe4d7e6096062b63c330709f44761838a;p=lttng-tools.git

Fix: check for lttng-ust >= 2.11 at configure

We don't support building lttng-tools against an older version of
lttng-ust, make this check explicitly at configure.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index e57f53631..066080738 100644
--- a/configure.ac
+++ b/configure.ac
@@ -562,14 +562,13 @@ AC_ARG_WITH([lttng-ust],
 
 AS_IF([test "x$with_lttng_ust" = "xyes"],
   [
-    AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer],
+    AC_CHECK_LIB([lttng-ust-ctl], [lttng_ust_enum_get_from_desc],
       [
         AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1])
       ],
       [
-        AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.2.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])
-      ],
-      [-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl]
+        AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.11.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])
+      ]
     )
   ]
 )