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

diff --git a/configure.ac b/configure.ac
index f001bd6c3..616608659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1054,7 +1054,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 +1139,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