X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=357e2b88896050709b4c7ae9a0b147dcd04eac94;hb=a29d73ddb79370ca3ae1b2562ffa4356983b4cf4;hp=e6bdcd529c66bde4852999e7bad0a6dd41204e9f;hpb=a9d0716cbfd1f751b1cdb21ada1a9ed6252d9d30;p=lttng-tools.git diff --git a/configure.ac b/configure.ac index e6bdcd529..357e2b888 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([lttng-tools],[2.11.0-rc2],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) +AC_INIT([lttng-tools],[2.11.0],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_AUX_DIR([config]) @@ -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.]) + ] ) ] ) @@ -1133,6 +1132,7 @@ AC_CONFIG_FILES([ tests/regression/tools/notification/Makefile tests/regression/tools/rotation/Makefile tests/regression/tools/base-path/Makefile + tests/regression/tools/metadata/Makefile tests/regression/ust/Makefile tests/regression/ust/nprocesses/Makefile tests/regression/ust/high-throughput/Makefile