From e3acbb50029bc80f2508868b08b2806c2b457f0f Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 28 Oct 2016 19:01:19 -0400
Subject: [PATCH] configure.ac: move warning to end of output for the end user
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 configure.ac | 31 ++++++++++++++++++-------------
 m4/pprint.m4 |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 885edb915..323b3df32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,6 +604,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])
@@ -624,19 +625,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([
-You need asciidoc and xmlto to build the LTTng-tools 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.
-
-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.
-			])
+			warn_prebuilt_man_pages=yes
 		])
 	], [
 		have_asciidoc_xmlto=yes
@@ -1219,3 +1208,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.])
+])
diff --git a/m4/pprint.m4 b/m4/pprint.m4
index 182810c3c..811e7a8d7 100644
--- a/m4/pprint.m4
+++ b/m4/pprint.m4
@@ -164,7 +164,7 @@ AC_DEFUN([PPRINT_WARN], [
   m4_pushdef([pprint_msg], [$1])
 
   _PPRINT_INDENT
-  AS_ECHO("${PPRINT_COLOR_TXTYLW}WARNING:$PPRINT_COLOR_RST ${PPRINT_COLOR_BLDYLW}pprint_msg$PPRINT_COLOR_RST")
+  AS_ECHO(["${PPRINT_COLOR_TXTYLW}WARNING:$PPRINT_COLOR_RST ${PPRINT_COLOR_BLDYLW}pprint_msg$PPRINT_COLOR_RST"])
 
   m4_popdef([pprint_msg])
 ])
-- 
2.34.1