X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=c85e4b1bca10933e994ab02a6ffa6c0c9744263c;hb=5a2ec6de7b327fa30cbb3de0b7e7fc26a0c2659a;hp=c56c44c6c821cbd16423cb6c4262fe8cae1563c4;hpb=7b66313326a56d8d1b400db6085f54ef13865f98;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index c56c44c6c..c85e4b1bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -958,7 +958,13 @@ AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "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"