AC_PREREQ([2.50])
m4_define([bt_version_major], [2])
-m4_define([bt_version_minor], [0])
+m4_define([bt_version_minor], [1])
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], [-rc1])
+m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_dev_stage)
+m4_define([bt_version_name], [])
-AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
+AC_INIT([babeltrace2], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
+AC_PROG_SED
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
m4_define([bt_lib_version_age], [0])
m4_define([bt_lib_version], bt_lib_version_current[:]bt_lib_version_revision[:]bt_lib_version_age)
+bt_version_description=""
+bt_version_description_c_safe=$(echo $bt_version_description | $SED 's/"/\\"/g')
+
AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
AC_CONFIG_HEADERS([src/common/config.h])
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_UNQUOTED([BT_VERSION_DESCRIPTION], ["$bt_version_description_c_safe"], [Babeltrace version description])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
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
[enable_python_bindings=no]
)
-# Python bindings documentation
-# Disabled by default
-AC_ARG_ENABLE([python-bindings-doc],
- [AC_HELP_STRING([--enable-python-bindings-doc], [build the Python bindings documentation])],
- [], dnl AC_ARG_ENABLE will fill enable_python_bindings_doc with the user choice
- [enable_python_bindings_doc=no]
-)
-
# Python plugins
# Disabled by default
AC_ARG_ENABLE([python-plugins],
# Set automake variables for optionnal feature conditionnals in Makefile.am
AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS], [test "x$enable_python_bindings" = xyes])
-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_DOC], [test "x$enable_python_bindings_doc" = xyes])
AM_CONDITIONAL([ENABLE_PYTHON_PLUGINS], [test "x$enable_python_plugins" = xyes])
AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$enable_debug_info" = xyes])
AM_CONDITIONAL([ENABLE_API_DOC], [test "x$enable_api_doc" = xyes])
# Check for conflicting optional features user choices
-AS_IF([test "x$enable_python_bindings" = xno],
- [
- AS_IF([test "x$enable_python_bindings_doc" = xyes], [AC_MSG_ERROR([--enable-python-bindings-doc was specified without --enable-python-bindings])])
- ]
-)
-
AS_IF([test "x$enable_built_in_plugins" = xyes],
[
# Built-in plug-ins are only available when the --disable-shared --enable-static options are used.
])
])
-AS_IF([test "x$enable_python_bindings_doc" = xyes],
- [
- AM_CHECK_PYTHON_SPHINX([PYTHON])
- AS_IF([test "x$PYTHON_SPHINX_EXISTS" = xno],
- [AC_MSG_ERROR([The Sphinx package for Python 3 is required to build the Python bindings documentation])]
- )
- ]
-)
-
AS_IF([test "x$enable_debug_info" = xyes],
[
# Check if libelf and libdw are present
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])]
)
AC_SUBST(program_transform_name)
AC_CONFIG_FILES([
- doc/api/Doxyfile
doc/api/Makefile
- doc/bindings/Makefile
- doc/bindings/python/Makefile
+ doc/api/libbabeltrace2/Doxyfile
+ doc/api/libbabeltrace2/Makefile
doc/contributing-images/Makefile
doc/Makefile
doc/man/asciidoc-attrs.conf
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.
test "x$enable_api_doc" = "xyes" && value=1 || value=0
PPRINT_PROP_BOOL([HTML API documentation], $value)
-test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Python bindings documentation], $value)
AS_ECHO
PPRINT_SUBTITLE([Logging])