AC_PREREQ([2.64])
-AC_INIT([lttng-tools],[2.8.0-rc1],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_INIT([lttng-tools],[2.8.7],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
AC_CONFIG_HEADERS([include/config.h])
AC_CONFIG_AUX_DIR([config])
]
)
-AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.))
+PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6])
# Check for libuuid
PKG_CHECK_MODULES([UUID], [uuid],
AC_ARG_ENABLE(kmod,
AS_HELP_STRING([--disable-kmod],[build without kmod support]),
- kmod_support=zz$enableval, kmod_support=yes)
+ kmod_support=$enableval, kmod_support=yes)
AS_IF([test "x$kmod_support" = "xyes"], [
AC_CHECK_LIB([kmod], [kmod_module_probe_insert_module],
AC_ARG_ENABLE([python-bindings],
[AC_HELP_STRING([--enable-python-bindings],
[compile Python bindings])],
- [enable_python_binding=yes], [enable_python_binding=no])
+ [enable_python_binding=$enableval], [enable_python_binding=no])
-AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes])
+AM_CONDITIONAL([PYTHON_BINDING], [test "x$enable_python_binding" = xyes])
-if test "x${enable_python_binding:-yes}" = xyes; then
+if test "x$enable_python_binding" = xyes; then
AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
AS_IF([test x$enable_shared = xno], [ AC_MSG_ERROR([Python bindings require shared libraries.]) ])
AM_PATH_PYTHON([3.0])
# check for asciidoc and xmlto if we enabled building the man pages
have_asciidoc_xmlto=no
+warn_prebuilt_man_pages=no
AS_IF([test "x$man_pages_opt" = "xyes"], [
AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
# thus asciidoc/xmlto are required because we were asked
# to build the man pages
AC_MSG_ERROR([
-Both asciidoc and xmlto are needed to build the LTTng man pages. Use
+You need asciidoc and xmlto to build the LTTng-tools man pages. Use
--disable-man-pages to disable building the man pages, in which case
they will not be installed.
])
# only warn here: since we're in the tarball, the man
# pages should already be generated at this point, thus
# asciidoc/xmlto are not strictly required
- AC_MSG_WARN([
-Both asciidoc and xmlto are needed to build the LTTng man pages. Note
-that the man pages are already built in this distribution tarball, so
-asciidoc and xmlto are only needed if you intend to modify their
-sources. Use --disable-man-pages to completely disable building
-and installing the man pages.
- ])
+ warn_prebuilt_man_pages=yes
])
], [
have_asciidoc_xmlto=yes
AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
+AC_DEFINE_UNQUOTED([MANPATH], ["`eval eval echo $mandir`"], [Path to man pages.])
+
# Python agent test
UST_PYTHON_AGENT="lttngust"
Makefile
doc/Makefile
doc/man/Makefile
- doc/man/asciidoc.conf
+ doc/man/asciidoc-attrs.conf
include/Makefile
extras/Makefile
extras/bindings/Makefile
tests/regression/ust/getcpu-override/Makefile
tests/regression/ust/clock-override/Makefile
tests/regression/ust/type-declarations/Makefile
+ tests/regression/ust/rotation-destroy-flush/Makefile
tests/stress/Makefile
tests/unit/Makefile
tests/unit/ini_config/Makefile
PPRINT_PROP_BOOL([LTTng-UST Python3 agent tests], $value)
#Python binding enabled/disabled
-test "x${enable_python_binding:-yes}" = xyes && value=1 || value=0
+test "x$enable_python_binding" = xyes && value=1 || value=0
AS_ECHO
PPRINT_SET_INDENT(0)
PPRINT_PROP_BOOL([Python binding], $value, $PPRINT_COLOR_SUBTITLE)
path="$CONSUMERD64_LIBDIR"
])
PPRINT_PROP_STRING([64-bit consumer libraries], [$path])
+PPRINT_SET_INDENT(0)
+
+AS_IF([test "x$warn_prebuilt_man_pages" = "xyes" ], [
+ AS_ECHO
+ PPRINT_WARN([You need asciidoc and xmlto to build the LTTng-tools man pages.
+
+Note that the man pages are already built in this distribution tarball,
+therefore asciidoc and xmlto are only needed if you intend to modify
+their sources.
+
+Also note that the installed man pages will contain the project's
+default command-line option and environment variable values.
+
+Use --disable-man-pages to completely disable building and installing
+the man pages.])
+])