-AC_INIT([lttng-tools],[2.1.0],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.2.0],[dgoulet@efficios.com],[],[http://lttng.org])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-version_name="Basse Messe"
-version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste"
+version_name="Cuda"
+version_description="Brewed at the Benelux microbrewery, this IPA has huge floral, citric and resinous hop aroma, simply an amazing nose. The flavor is very fresh with a light caramel malting touch completing a strong body. Huge amounts of hops, lots of grapefruit, lemon and oranges. This is an outstanding IPA!"
AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "")
[CONSUMERD64_LIBDIR=''])
AC_SUBST([CONSUMERD64_LIBDIR])
+AC_ARG_WITH([sessiond-bin],
+ AS_HELP_STRING([--with-sessiond-bin],
+ [Location of the sessiond executable (including the filename)]),
+ [SESSIOND_BIN="$withval"],
+ [SESSIOND_BIN=''])
+AC_SUBST([SESSIOND_BIN])
+
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], "$CONSUMERD32_BIN", [Location of the 32-bit consumerd executable.])
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], "$CONSUMERD64_BIN", [Location of the 64-bit consumerd executable])
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], "$CONSUMERD32_LIBDIR", [Search for consumerd 32-bit libraries in this location.])
AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], "$CONSUMERD64_LIBDIR", [Search for consumerd 64-bit libraries in this location.])
AC_DEFINE_UNQUOTED([CONFIG_BABELTRACE_BIN], "$BABELTRACE_BIN", [Location of the babeltrace viewer executable.])
AC_DEFINE_UNQUOTED([CONFIG_LTTV_GUI_BIN], "$LTTV_GUI_BIN", [Location of the lttv GUI viewer executable.])
+AC_DEFINE_UNQUOTED([CONFIG_SESSIOND_BIN], "$SESSIOND_BIN", [Location of the sessiond executable.])
# Check for pthread
AC_CHECK_LIB([pthread], [pthread_create], [],
AC_CHECK_DECL([caa_likely], [],
[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
)
+#Function added in urcu 0.7.0
+AC_CHECK_DECL([cmm_smp_mb__before_uatomic_or], [],
+ [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
+)
+
+AC_ARG_WITH(lttng-ust-prefix,
+ AS_HELP_STRING([--with-lttng-ust-prefix=PATH],
+ [Specify the installation prefix of the lttng-ust library.
+ Headers must be in PATH/include; libraries in PATH/lib.]),
+ [
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
+ ])
# Check liblttng-ust-ctl library
AC_ARG_ENABLE(lttng-ust,
lttng_ust_support=$enableval, lttng_ust_support=yes)
AS_IF([test "x$lttng_ust_support" = "xyes"], [
- AC_CHECK_LIB([lttng-ust-ctl], [ustctl_set_filter],
+ AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer],
[
AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST control support])
lttng_ust_ctl_found=yes
],
- [AC_MSG_ERROR([Cannot find LTTng-UST 2.1.x. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
+ [AC_MSG_ERROR([Cannot find LTTng-UST >= 2.2.x. Use --with-lttng-ust-prefix=PREFIX to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
[-lurcu-common -lurcu-bp -lurcu-cds -lrt]
)
])
tests/regression/tools/streaming/Makefile
tests/regression/tools/filtering/Makefile
tests/regression/tools/health/Makefile
+ tests/regression/tools/tracefile-limits/Makefile
+ tests/regression/tools/snapshots/Makefile
tests/regression/ust/Makefile
tests/regression/ust/nprocesses/Makefile
tests/regression/ust/high-throughput/Makefile
tests/regression/ust/low-throughput/Makefile
tests/regression/ust/before-after/Makefile
tests/regression/ust/buffers-uid/Makefile
+ tests/regression/ust/periodical-metadata-flush/Makefile
tests/regression/ust/multi-session/Makefile
tests/regression/ust/overlap/Makefile
tests/regression/ust/overlap/demo/Makefile
+ tests/regression/ust/linking/Makefile
+ tests/regression/ust/daemon/Makefile
+ tests/regression/ust/exit-fast/Makefile
+ tests/regression/ust/fork/Makefile
+ tests/regression/ust/libc-wrapper/Makefile
+ tests/stress/Makefile
tests/unit/Makefile
tests/utils/Makefile
tests/utils/tap/Makefile
+ tests/utils/testapp/Makefile
+ tests/utils/testapp/gen-ust-events/Makefile
])
AC_OUTPUT
# If we build the sessiond, print the paths it will use
AS_IF([test "x$consumerd_only" = "xno"],[
+ AS_ECHO()
+ AS_ECHO_N("The lttng command will look for the lttng-sessiond executable at: ")
+ AS_IF([test "$SESSIOND_BIN" = ""],[
+ AS_ECHO_N("`eval eval echo $bindir`")
+ AS_ECHO("/lttng-sessiond")
+ ],[
+ AS_ECHO("$SESSIOND_BIN")
+ ])
+
AS_ECHO()
AS_ECHO("The sessiond daemon will look in the following directories: ")
AS_ECHO_N("32-bit consumerd executable at: ")