AC_PREREQ([2.64])
-AC_INIT([lttng-tools],[2.9.9],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_INIT([lttng-tools],[2.9.10],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
AC_CONFIG_HEADERS([include/config.h])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax nostdinc])
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
AX_LIB_SOCKET_NSL
_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_START], [Start tracing])
_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_STATUS], [Get the status of the current tracing session])
_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_STOP], [Stop tracing])
-_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_TRACK], [Track specific system resources])
-_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_UNTRACK], [Untrack specific system resources])
+_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_TRACK], [Track specific processes])
+_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_UNTRACK], [Untrack specific processes])
_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_VERSION], [Show version information])
_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_VIEW], [Start trace viewer])
[Specify the installation prefix of the kmod library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
- CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
[Specify the installation prefix of the lttng-ust library.
Headers must be in PATH/include; libraries in PATH/lib.]),
[
- CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
])
])
AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = "xyes"])
-AC_ARG_ENABLE([git-version],
- [AC_HELP_STRING([--disable-git-version],
- [Do not use the git version for the build])],
- [have_git_version=$enableval], [have_git_version=yes]
-)
-
-AM_CONDITIONAL([LTTNG_TOOLS_BUILD_GIT_SOURCE],
- [test "x${have_git_version}" = "xyes"])
-
# For Python
# SWIG version needed or newer:
swig_version=2.0.0
# export flex condition
AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
+AC_SUBST(AM_CFLAGS)
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
+# 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"
src/common/index/Makefile
src/common/health/Makefile
src/common/config/Makefile
+ src/common/fd-tracker/Makefile
src/lib/Makefile
src/lib/lttng-ctl/Makefile
src/lib/lttng-ctl/filter/Makefile
tests/regression/tools/crash/Makefile
tests/regression/tools/regen-metadata/Makefile
tests/regression/tools/regen-statedump/Makefile
+ tests/regression/tools/working-directory/Makefile
+ tests/regression/tools/relayd-grouping/Makefile
tests/regression/ust/Makefile
tests/regression/ust/nprocesses/Makefile
tests/regression/ust/high-throughput/Makefile