X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=5f5f9e542a0776c55fe2b99911810e2234a1857e;hp=391c781e16f74061212798205cdd31732c65f9d5;hb=9fe935775f8d87b2bb61ec986bc81c8c7e3348b6;hpb=9d8c7763592fc66d2005b36bf7068d374a2e6232

diff --git a/configure.ac b/configure.ac
index 391c781e1..5f5f9e542 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.9.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -75,8 +75,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [LTTng-Tools major version n
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [LTTng-Tools minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [LTTng-Tools patchlevel version number])
 
-version_name="Isseki Nicho"
-version_description='The result of a collaboration between Dieu du Ciel! and Nagano-based Shiga Kogen, Isseki Nicho is a strong Imperial Dark Saison offering a rich roasted malt flavor combined with a complex fruity finish typical of Saison yeasts.'
+version_name="Codename TBD"
+version_description='Description TBD'
 version_description_c=$(echo $version_description | $SED 's/"/\\"/g')
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
@@ -122,7 +122,7 @@ AC_CHECK_FUNCS([ \
 	gethostbyname gethostname getpagesize localtime_r memchr memset \
 	mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \
 	strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \
-	strtoull dirfd gethostbyname2 getipnodebyname \
+	strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \
 ])
 
 # Babeltrace viewer check
@@ -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`"