Fix: check for a session daemon before running load command

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e761d0bcf27ad590a65c671a62b2b30ef14346ef..29eb2980396a8cdaeabb35e2151c6d147eb56c68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.64])
-AC_INIT([lttng-tools],[2.8.0],[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,7 @@ 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])
 
 # Check for libuuid
 PKG_CHECK_MODULES([UUID], [uuid],
@@ -394,7 +394,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 +621,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"