X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=fd65ba23439c121551192044b8d32259dd9ce832;hp=07b9c4dab97f85339ab42287b74923e06a4dfb0b;hb=008559fa85b489bbc27f970f95d51e8781ace8a1;hpb=65385a822c061a32c9059caac52f1a69bd06795b

diff --git a/configure.ac b/configure.ac
index 07b9c4dab..fd65ba234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ AS_IF([test "x$libtool_fixup" = "xyes"],
 	    [
 		  AC_MSG_RESULT([$libtool_flag_pattern_count])
 		  AC_MSG_WARN([the detected libtool will not link all dependencies, forcing link_all_deplibs = unknown])
-		  SED -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4
+		  $SED -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4
 		  ],
 		  [
 		  AC_MSG_RESULT([none])
@@ -488,6 +488,35 @@ if test "x$test_java_agent_jul" = "xyes" || test "x$test_java_agent_log4j" = "xy
 	fi
 fi
 
+# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file
+# is not distributed in tarballs
+AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no])
+AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"])
+
+# enable building man pages
+AC_ARG_ENABLE(
+	build-man-pages,
+	AS_HELP_STRING(
+		[--enable-build-man-pages],
+		[Build man pages (already built in a distributed tarball)]
+	),
+	[enable_build_man_pages=yes],
+	[enable_build_man_pages=no]
+)
+
+# export man page build condition
+AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$enable_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"], [
+	AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
+	AC_PATH_PROG([XMLTO], [xmlto], [no])
+
+	AS_IF([test "x$ASCIIDOC" = "xno" || test "x$XMLTO" = "xno"], [
+		AC_MSG_ERROR([Both asciidoc and xmlto are needed to build the LTTng man pages.])
+	])
+])
+
 # Python agent test
 UST_PYTHON_AGENT="lttngust"
 
@@ -807,6 +836,7 @@ AC_CONFIG_FILES([
 	src/bin/lttng/Makefile
 	src/bin/lttng-crash/Makefile
 	tests/Makefile
+	tests/destructive/Makefile
 	tests/regression/Makefile
 	tests/regression/kernel/Makefile
 	tests/regression/tools/Makefile
@@ -821,6 +851,7 @@ AC_CONFIG_FILES([
 	tests/regression/tools/mi/Makefile
 	tests/regression/tools/wildcard/Makefile
 	tests/regression/tools/crash/Makefile
+	tests/regression/tools/metadata-regen/Makefile
 	tests/regression/ust/Makefile
 	tests/regression/ust/nprocesses/Makefile
 	tests/regression/ust/high-throughput/Makefile
@@ -843,6 +874,7 @@ AC_CONFIG_FILES([
 	tests/regression/ust/python-logging/Makefile
 	tests/regression/ust/getcpu-override/Makefile
 	tests/regression/ust/clock-override/Makefile
+	tests/regression/ust/type-declarations/Makefile
 	tests/stress/Makefile
 	tests/unit/Makefile
 	tests/unit/ini_config/Makefile
@@ -992,6 +1024,8 @@ AS_IF([test ! -z "$PYTHON3_AGENT"],[
 	AS_ECHO("Disabled")
 ])
 
+AS_ECHO()
+
 #Python binding enabled/disabled
 AS_ECHO_N("Python binding: ")
 AS_IF([test "x${enable_python_binding:-yes}" = xyes], [
@@ -1000,8 +1034,31 @@ AS_IF([test "x${enable_python_binding:-yes}" = xyes], [
 	AS_ECHO("Disabled")
 ])
 
-# If we build the sessiond, print the paths it will use
 AS_ECHO()
+
+# man pages build enabled/disabled
+AS_ECHO_N("Build man pages: ")
+AS_IF([test "x$enable_build_man_pages" = "xyes"], [
+	AS_ECHO("Yes")
+], [
+	AS_IF([test "x$in_git_repo" = "xyes"], [
+		AS_ECHO("No")
+	], [
+		AS_ECHO("Already built")
+	])
+])
+
+# man pages install enabled/disabled (always true in tarball)
+AS_ECHO_N("Install man pages: ")
+AS_IF([test "x$enable_build_man_pages" = "xno" && test "x$in_git_repo" = "xyes"], [
+	AS_ECHO("No")
+], [
+	AS_ECHO("Yes")
+])
+
+AS_ECHO()
+
+# If we build the sessiond, print the paths it will use
 AS_ECHO_N("The lttng command will search for the lttng-sessiond executable at: ")
 AS_IF([test "$SESSIOND_BIN" = ""],[
 	AS_ECHO_N("`eval eval echo $bindir`")