-AC_INIT([lttng-tools],[2.7.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_PREREQ([2.64])
+AC_INIT([lttng-tools],[2.7.0-rc1],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [LTTng-Tools minor version number])
AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [LTTng-Tools patchlevel version number])
-version_name="Gaia"
-version_description="From Benelux brewery in Montreal, the Gaia is a witbier with a cloudy light amber ale color. Aroma of coriander with floral hay notes is enchanting. Taste is also dominated by the very floral coriander note and some medium sweet malt notes."
+version_name="Herbe à Détourne"
+version_description='Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.'
+version_description_c=$(echo $version_description | sed 's/"/\\"/g')
AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
-AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "")
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], "")
AC_CONFIG_HEADERS([include/config.h])
lttng_ust_ctl_found=yes
],
[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]
+ [-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl]
)
])
AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
AC_ARG_ENABLE([python-bindings],
[AC_HELP_STRING([--enable-python-bindings],
[compile Python bindings])],
- [enable_python=yes], [enable_python=no])
+ [enable_python_binding=yes], [enable_python_binding=no])
-AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes])
+AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes])
-if test "x${enable_python:-yes}" = xyes; then
+if test "x${enable_python_binding:-yes}" = xyes; then
AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
- AM_PATH_PYTHON
+ AM_PATH_PYTHON([3.0])
AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
AC_MSG_ERROR([[bison not found and is required when building from git.
Please install bison]])
fi
+ AC_PATH_PROG([BISON],[bison])
+ AX_PROG_BISON_VERSION([2.4], [],[
+ AC_MSG_ERROR([[Bison >= 2.4 is required when building from git]])
+ ])
fi
if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then
AC_MSG_ERROR([[flex not found and is required when building from git.
Please install flex]])
fi
+ AC_PATH_PROG([FLEX],[flex])
+ AX_PROG_FLEX_VERSION([2.5.35], [],[
+ AC_MSG_ERROR([[Flex >= 2.5.35 is required when building from git]])
+ ])
fi
CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
src/bin/lttng-sessiond/Makefile
src/bin/lttng-relayd/Makefile
src/bin/lttng/Makefile
+ src/bin/lttng-crash/Makefile
tests/Makefile
tests/regression/Makefile
tests/regression/kernel/Makefile
tests/regression/ust/java-jul/Makefile
tests/regression/ust/java-log4j/Makefile
tests/regression/ust/python-logging/Makefile
+ tests/regression/ust/getcpu-override/Makefile
+ tests/regression/ust/clock-override/Makefile
tests/stress/Makefile
tests/unit/Makefile
tests/unit/ini_config/Makefile
#Python binding enabled/disabled
AS_ECHO_N("Python binding: ")
-AS_IF([test "x${enable_python:-yes}" = xyes], [
+AS_IF([test "x${enable_python_binding:-yes}" = xyes], [
AS_ECHO("Enabled")
],[
AS_ECHO("Disabled")