[lttng-dev] [PATCH lttng-tools stable-2.11] fix: check for lttng-ust >= 2.11 at configure

[Jérémie Galarneau]

Merged in master and stable-2.11. Thanks!

Jérémie

On Wed, Oct 23, 2019 at 11:08:34AM -0400, Michael Jeanson wrote:
> 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 at efficios.com>
> ---
>  configure.ac | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 5c4073ef8..357e2b888 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.])
> +      ]
>      )
>    ]
>  )
> -- 
> 2.17.1
>