Skip to contentSkip to conversation

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

PATCH Jérémie Galarneau 1 participant 1 message Oct 24, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged in master and stable-2.11. Thanks!

Jérémie

Quoted 33 lines · Michael Jeanson

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

---
 configure.ac | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
configure.ac +3 -4
index 5c4073ef8..357e2b888 100644
@@ -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.])
+      ]
     )
   ]
 )
Signature · 1 line
2.17.1