From 9aba4735342323e43b04e267ad6cf1bf2c05bf54 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 15 May 2018 17:27:52 -0400 Subject: [PATCH] DIST OOT: use build_dir version.i file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Requires the change of priority for include file in AM_CPPFLAGS and that the version.h file include a "system header" version.i instead of a local version. Enable the passing of value from version.i to a OOT build done from a distribution tarball. Enable a packager to touch files in custom_modifications and generate a valid version.i file to be used in a OOT build from tarball. Signed-off-by: Jonathan Rajotte Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- configure.ac | 8 +++++++- include/Makefile.am | 3 +++ include/version.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0a6e5aac2..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" diff --git a/include/Makefile.am b/include/Makefile.am index 79597f4f2..9f8bf2301 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -51,6 +51,9 @@ version_verbose_0 = @echo " GEN " $@; version.i: $(version_verbose)rm -f version.i.tmp; \ + if (test ! -f version.i && test -f "$(top_srcdir)/include/version.i"); then \ + cp "$(top_srcdir)/include/version.i" version.i; \ + fi; \ if (test -r "$(top_srcdir)/bootstrap" && test -r "$(top_srcdir)/.git") && \ test -x "`which git 2>&1;true`"; then \ GIT_VERSION_STR="`cd "$(top_srcdir)" && git describe --tags --dirty`"; \ diff --git a/include/version.h b/include/version.h index 0f3f7c80c..0eaf5958b 100644 --- a/include/version.h +++ b/include/version.h @@ -18,6 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "version.i" +#include #endif /* VERSION_H */ -- 2.34.1