Fix: flt-utils.trimmer: accept streams without packet support

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6bbedb0361c0ba86fdfd399a817e06fb0a1a9cad..a7a094a411d5d558f7ce633f0847dc1efaa57104 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,11 +28,13 @@ 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_patch], [2])
+m4_define([bt_version_dev_stage], [])
+m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_dev_stage)
+m4_define([bt_version_name], [Amqui])
 
-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
@@ -41,6 +43,9 @@ m4_define([bt_lib_version_revision], [0])
 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="Amqui (/ɒmkwiː/) is a town in eastern Québec, Canada, at the base of the Gaspé peninsula in Bas-Saint-Laurent. Located at the confluence of the Humqui and Matapédia Rivers, its proximity to woodlands makes it a great destination for outdoor activities such as camping, hiking, and mountain biking."
+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])
@@ -50,7 +55,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_UNQUOTED([BT_VERSION_DESCRIPTION], ["$bt_version_description_c_safe"], [Babeltrace version description])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -192,6 +199,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
@@ -358,14 +366,6 @@ AC_ARG_ENABLE([python-bindings],
   [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],
@@ -417,7 +417,6 @@ AC_ARG_ENABLE([man-pages],
 
 # 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])
@@ -455,12 +454,6 @@ AC_SUBST([ENABLE_DEBUG_INFO_VAL])
 
 # 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.
@@ -531,15 +524,6 @@ AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins"
   ])
 ])
 
-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
@@ -727,8 +711,6 @@ AC_CONFIG_FILES([
        doc/api/Makefile
        doc/api/libbabeltrace2/Doxyfile
        doc/api/libbabeltrace2/Makefile
-       doc/bindings/Makefile
-       doc/bindings/python/Makefile
        doc/contributing-images/Makefile
        doc/Makefile
        doc/man/asciidoc-attrs.conf
@@ -815,9 +797,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.
@@ -898,8 +896,6 @@ m4_popdef([build_man_pages_msg])
 
 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])