Build: Replace use of deprecated AM_PATH_XML2

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dc32e0069086bd47457b249087333e577c8e1812..a41d396ffd97ff5c3b3fe91dfa1cba56779e8f84 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 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.1],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -320,7 +320,9 @@ PKG_CHECK_MODULES([POPT], [popt],
        ]
 )
 
-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])
+AC_SUBST([XML_CFLAGS])
+AC_SUBST([XML_LIBS])
 
 # Check for libuuid
 PKG_CHECK_MODULES([UUID], [uuid],
@@ -394,7 +396,7 @@ AC_ARG_WITH(kmod-prefix,
 
 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],
@@ -621,6 +623,8 @@ and installing the man pages.
 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"
 
@@ -931,7 +935,7 @@ AC_CONFIG_FILES([
        Makefile
        doc/Makefile
        doc/man/Makefile
-       doc/man/asciidoc.conf
+       doc/man/asciidoc-attrs.conf
        include/Makefile
        extras/Makefile
        extras/bindings/Makefile
@@ -1002,6 +1006,7 @@ AC_CONFIG_FILES([
        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