X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=ff07d34d5a1b67207b890556b46e830410310fc6;hb=b719391009b8386205ec6540221cbc78f6190f31;hp=11811f4226ed545bcfb660bb99570abb5b0ac74f;hpb=1486dfe1f2e8222baa5448ef7c7f58a3d0083789;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 11811f422..ff07d34d5 100644
--- 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.0-rc1],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -499,18 +499,18 @@ AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"])
 AC_ARG_ENABLE(
 	build-man-pages,
 	AS_HELP_STRING(
-		[--enable-build-man-pages],
+		[--disable-build-man-pages],
 		[Build man pages (already built in a distributed tarball)]
 	),
-	[enable_build_man_pages=yes],
-	[enable_build_man_pages=no]
+	[build_man_pages=$enableval],
+	[build_man_pages=yes]
 )
 
 # export man page build condition
-AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$enable_build_man_pages" != "xno"])
+AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$build_man_pages" != "xno"])
 
 # check for asciidoc and xmlto if we enabled building the man pages
-AS_IF([test "x$enable_build_man_pages" = "xyes"], [
+AS_IF([test "x$build_man_pages" = "xyes"], [
 	AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
 	AC_PATH_PROG([XMLTO], [xmlto], [no])
 
@@ -994,8 +994,7 @@ AS_ECHO
 PPRINT_SUBTITLE([Man pages])
 
 # man pages build enabled/disabled
-test "x$enable_build_man_pages" = "xyes" && value=1 || value=0
-AS_IF([test "x$enable_build_man_pages" = "xyes"], [
+AS_IF([test "x$build_man_pages" = "xyes"], [
 	PPRINT_PROP_BOOL([Build man pages], 1)
 ], [
 	AS_IF([test "x$in_git_repo" = "xyes"], [
@@ -1006,7 +1005,7 @@ AS_IF([test "x$enable_build_man_pages" = "xyes"], [
 ])
 
 # man pages install enabled/disabled (always true in tarball)
-test "x$enable_build_man_pages" = "xno" && test "x$in_git_repo" = "xyes" && value=0 || value=1
+test "x$build_man_pages" != "xyes" && test "x$in_git_repo" = "xyes" && value=0 || value=1
 PPRINT_PROP_BOOL([Install man pages], $value)
 
 report_bindir="`eval eval echo $bindir`"