X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=06b5d18553abc59d01eacfbd7789dffdb8a69a18;hb=refs%2Fheads%2Fstable-2.8;hp=358bcb61036cfb04533dc0b630543ef150db6a42;hpb=d11e0dba0df9024b8613c51e167a379b91e8b20b;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 358bcb610..06b5d1855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.64])
-AC_INIT([lttng-tools],[2.8.1],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_INIT([lttng-tools],[2.8.8],[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],
@@ -583,6 +583,7 @@ AC_ARG_ENABLE(
 
 # 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])
@@ -595,7 +596,7 @@ AS_IF([test "x$man_pages_opt" = "xyes"], [
 			# 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.
 			])
@@ -603,13 +604,7 @@ 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
@@ -1187,3 +1182,19 @@ AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[
 	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.])
+])