X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=06608073896d421ca04b7b6506af73376418907a;hp=f001bd6c3141bf680a017ee977dea5e8cf4218ef;hb=df0b021fe4d7e6096062b63c330709f44761838a;hpb=2a1668643ca94195d5c3889d0337e19165805a42

diff --git a/configure.ac b/configure.ac
index f001bd6c3..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.])
+      ]
     )
   ]
 )
@@ -1054,7 +1053,13 @@ AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes])
 AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
-AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+# The order in which the include folders are searched is important.
+# The top_builddir should always be searched first in the event that a build
+# time generated file is included. An example of this is the "version.i" file.
+# In a scenario where lttng-tools is built from a distribution tarball and in a
+# out-of-tree manner, the generated "version.i" has priority on the one from
+# the source (distribution tarball) and must be found first.
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
 AC_SUBST(AM_CPPFLAGS)
 
 lttngincludedir="${includedir}/lttng"
@@ -1133,6 +1138,8 @@ 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/tools/working-directory/Makefile
 	tests/regression/ust/Makefile
 	tests/regression/ust/nprocesses/Makefile
 	tests/regression/ust/high-throughput/Makefile
@@ -1159,6 +1166,7 @@ AC_CONFIG_FILES([
 	tests/regression/ust/type-declarations/Makefile
 	tests/regression/ust/rotation-destroy-flush/Makefile
 	tests/regression/ust/blocking/Makefile
+	tests/regression/ust/namespaces/Makefile
 	tests/stress/Makefile
 	tests/unit/Makefile
 	tests/unit/ini_config/Makefile
@@ -1166,7 +1174,9 @@ AC_CONFIG_FILES([
 	tests/utils/Makefile
 	tests/utils/tap/Makefile
 	tests/utils/testapp/Makefile
+	tests/utils/testapp/gen-ns-events/Makefile
 	tests/utils/testapp/gen-ust-events/Makefile
+	tests/utils/testapp/gen-ust-events-ns/Makefile
 	tests/utils/testapp/gen-syscall-events-callstack/Makefile
 	tests/utils/testapp/gen-ust-nevents/Makefile
 	tests/utils/testapp/gen-ust-nevents-str/Makefile