X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=0bc2a012413dcb088cf09b376d2dd339a24af4f6;hb=842193c9701fb1ab4133d126f6b23937cdcc383b;hp=7cbe3ba72220b691074dfd5a2a5d228cc6a1dbd0;hpb=2d786d152cfbc684e9c800929debd423d6c56812;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 7cbe3ba7..0bc2a012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,10 @@ AC_PREREQ([2.50])
 m4_define([bt_version_major], [2])
 m4_define([bt_version_minor], [0])
 m4_define([bt_version_patch], [0])
-m4_define([bt_version_extra], [-rc4])
-m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
+m4_define([bt_version_dev_stage], [-rc4])
+m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_dev_stage)
+m4_define([bt_version_name], [])
+m4_define([bt_version_description], [])
 
 AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
 
@@ -50,7 +52,9 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version])
 AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version])
 AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace patch version])
-AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace extra version])
+AC_DEFINE([BT_VERSION_DEV_STAGE], ["]bt_version_dev_stage["], [Babeltrace version development stage (can be empty)])
+AC_DEFINE([BT_VERSION_NAME], ["]bt_version_name["], [Babeltrace version name])
+AC_DEFINE([BT_VERSION_DESCRIPTION], ["]bt_version_description["], [Babeltrace version description])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -192,6 +196,7 @@ LT_INIT([win32-dll])
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
+AC_PATH_PROG([report_fold], [fold])
 
 # set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file
 # is not distributed in tarballs
@@ -563,7 +568,7 @@ AS_IF([test "x$enable_api_doc" = "xyes"],
     DX_XML_FEATURE(OFF)
     DX_PDF_FEATURE(OFF)
     DX_PS_FEATURE(OFF)
-    DX_INIT_DOXYGEN([Babeltrace], [$(srcdir)/Doxyfile], [output])
+    DX_INIT_DOXYGEN([Babeltrace 2], [$(builddir)/Doxyfile], [output])
     AS_IF([test -z "$DX_DOXYGEN"],
 	  [AC_MSG_ERROR([You need doxygen to enable the API documentation])]
     )
@@ -724,8 +729,9 @@ program_transform_name="s&babeltrace2\.bin&babeltrace2&;$program_transform_name"
 AC_SUBST(program_transform_name)
 
 AC_CONFIG_FILES([
-	doc/api/Doxyfile
 	doc/api/Makefile
+	doc/api/libbabeltrace2/Doxyfile
+	doc/api/libbabeltrace2/Makefile
 	doc/bindings/Makefile
 	doc/bindings/python/Makefile
 	doc/contributing-images/Makefile
@@ -814,9 +820,25 @@ PPRINT_SET_INDENT(1)
 PPRINT_SET_TS(38)
 
 AS_ECHO
-AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION$PPRINT_COLOR_RST")
+
+AS_IF([test -n "bt_version_name"], [
+	AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION \"bt_version_name\"$PPRINT_COLOR_RST")
+], [
+	AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION")
+])
+
 AS_ECHO
 
+AS_IF([test -n "bt_version_description"], [
+	AS_IF([test -n "$report_fold"], [
+		AS_ECHO("`AS_ECHO("bt_version_description") | $report_fold -s`")
+	], [
+		AS_ECHO("bt_version_description")
+	])
+
+	AS_ECHO
+])
+
 PPRINT_SUBTITLE([System])
 
 # Target architecture we're building for.