X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=f9f3fab71632018a2e7138fec64a63283edfe148;hp=54afbd3a2f24637cdd938128255b0cc3d5a87335;hb=867eb7632255f6a84234542198bd7edaac1bce12;hpb=ce42d217e430064d65bd89e38cb44721270e3c61

diff --git a/configure.ac b/configure.ac
index 54afbd3a..f9f3fab7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,39 +1,19 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (c) 2017 EfficiOS, Inc.
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a copy
-dnl of this software and associated documentation files (the "Software"), to deal
-dnl in the Software without restriction, including without limitation the rights
-dnl to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-dnl copies of the Software, and to permit persons to whom the Software is
-dnl furnished to do so, subject to the following conditions:
+dnl SPDX-License-Identifier: MIT
 dnl
-dnl The above copyright notice and this permission notice shall be included in
-dnl all copies or substantial portions of the Software.
+dnl Copyright (C) 2017 EfficiOS, Inc.
 dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-dnl AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-dnl OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-dnl SOFTWARE.
-
-##                     ##
-## Autoconf base setup ##
-##                     ##
-
-AC_PREREQ([2.50])
+dnl Process this file with autoconf to produce a configure script.
 
+# Project version information
 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], [-pre6])
-m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
-
-AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
+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], [[Codename TBD]])
+m4_define([bt_version_description], [[Description TBD]])
 
+# Library version information of "libbabeltrace2"
 # 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_current], [0])
@@ -41,6 +21,14 @@ 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)
 
+
+##                     ##
+## Autoconf base setup ##
+##                     ##
+
+AC_PREREQ([2.69])
+AC_INIT([babeltrace2],[bt_version],[jeremie dot galarneau at efficios dot com],[],[https://efficios.com/babeltrace/])
+
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
 
 AC_CONFIG_HEADERS([src/common/config.h])
@@ -50,7 +38,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], ["]AS_ESCAPE(bt_version_description)["], [Babeltrace version description])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -60,11 +50,11 @@ AC_CANONICAL_HOST
 ## Automake base setup ##
 ##                     ##
 
-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
+AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
 AM_MAINTAINER_MODE([enable])
 
-# Enable silent rules if available (Introduced in AM 1.11)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+# Enable silent rules by default
+AM_SILENT_RULES([yes])
 
 
 ##                      ##
@@ -72,23 +62,26 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 ##                      ##
 
 MINGW32=no
-DEFAULT_ENABLE_DEBUG_INFO=yes
 LT_NO_UNDEFINED=""
 AS_CASE([$host_os],
   [solaris*|darwin*],
     [
-	DEFAULT_ENABLE_DEBUG_INFO=no
+      AE_FEATURE_DISABLE([debug-info])
+    ],
+  [freebsd*],
+    [
+      AE_FEATURE_DISABLE([debug-info])
     ],
   [cygwin*],
     [
-	DEFAULT_ENABLE_DEBUG_INFO=no
-	LT_NO_UNDEFINED="-no-undefined"
+      AE_FEATURE_DISABLE([debug-info])
+      LT_NO_UNDEFINED="-no-undefined"
     ],
   [mingw*],
     [
-	MINGW32=yes
-	DEFAULT_ENABLE_DEBUG_INFO=no
-	LT_NO_UNDEFINED="-no-undefined"
+      MINGW32=yes
+      AE_FEATURE_DISABLE([debug-info])
+      LT_NO_UNDEFINED="-no-undefined"
     ]
 )
 
@@ -100,16 +93,19 @@ AC_SUBST(LT_NO_UNDEFINED)
 ## C compiler checks ##
 ##                   ##
 
-AC_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
-
-# Choose the c compiler
+# Choose the C compiler
 AC_PROG_CC
+# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
+m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
 
-# Make sure the c compiler supports C99
-AC_PROG_CC_C99([], [AC_MSG_ERROR([The compiler does not support C99])])
+# Make sure the C compiler supports C99
+AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not support C99])])
 
-# Make sure the c compiler supports __attributes__
+# Enable available system extensions and LFS support
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+
+# Make sure the C compiler supports __attributes__
 AX_C___ATTRIBUTE__
 AS_IF([test "x$ax_cv___attribute__" != "xyes"],
   [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
@@ -120,13 +116,13 @@ AX_PTHREAD([], [AC_MSG_ERROR([Could not configure pthread support])])
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_C_TYPEOF
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
 AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T
 AC_TYPE_INT8_T
 AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
@@ -135,23 +131,31 @@ AC_TYPE_UINT8_T
 AC_CHECK_TYPES([ptrdiff_t])
 
 
+##                     ##
+## C++ compiler checks ##
+##                     ##
+
+# Require a C++11 compiler without GNU extensions (-std=c++11)
+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+
+
 ##               ##
 ## Header checks ##
 ##               ##
 
 AC_HEADER_STDBOOL
 AC_CHECK_HEADERS([ \
-	fcntl.h \
-	float.h \
-	ftw.h \
-	libintl.h \
-	limits.h \
-	malloc.h \
-	netdb.h \
-	netinet/in.h \
-	stddef.h \
-	sys/socket.h \
-	sys/time.h
+  fcntl.h \
+  float.h \
+  ftw.h \
+  libintl.h \
+  limits.h \
+  malloc.h \
+  netdb.h \
+  netinet/in.h \
+  stddef.h \
+  sys/socket.h \
+  sys/time.h
 ])
 
 
@@ -181,29 +185,31 @@ AX_CHECK_LINK_FLAG([-Wl,--whole-archive,--no-whole-archive],
   ]
 )
 
-# Initialize and configure libtool
-LT_INIT([win32-dll])
+# Check if the linker supports the "notext" keyword
+AX_CHECK_LINK_FLAG([-Wl,-z,notext],[
+  AC_SUBST([LD_NOTEXT], [-Wl,-z,notext])
+])
 
 
 ##                 ##
 ## Programs checks ##
 ##                 ##
 
+AM_PROG_AR
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
-
-# 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"])
+AC_PROG_SED
+AC_CHECK_PROGS([FOLD], [fold])
+AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
+AC_CHECK_PROGS([XMLTO], [xmlto])
 
 # check for bison
 AC_PROG_YACC
 AX_PROG_BISON_VERSION([2.5], [have_bison=yes])
 
 AS_IF([test "x$have_bison" != "xyes"], [
-  AS_IF([test "x$in_git_repo" = "xyes"], [
+  AE_IF_IN_GIT_REPO([
     AC_MSG_FAILURE([dnl
 Bison >= 2.4 is required when building from the Git repository. You can
 set the YACC variable to override automatic detection.
@@ -220,11 +226,13 @@ detection.
 AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"])
 
 # check for flex
-AC_PROG_LEX
+# Prior to autoconf 2.70, AC_PROG_FLEX did not take an argument. This is not a
+# problem since the argument is silently ignored by older versions.
+AC_PROG_LEX([noyywrap])
 AX_PROG_FLEX_VERSION([2.5.35], [have_flex=yes])
 
 AS_IF([test "x$have_flex" != "xyes"], [
-  AS_IF([test "x$in_git_repo" = "xyes"], [
+  AE_IF_IN_GIT_REPO([
     AC_MSG_FAILURE([dnl
 Flex >= 2.5.35 is required when building from the Git repository. You can
 set the LEX variable to override automatic detection.
@@ -240,6 +248,46 @@ detection.
 ])
 AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
 
+# Always check for python, we will fail later if some features require it and
+# it's unavailable.
+AM_PATH_PYTHON([3.0], [
+  AE_PATH_PYTHON_MODULES([PYTHON])
+
+  # pythondir is the path where extra modules are to be installed
+  pythondir=$PYTHON_PREFIX/$PYTHON_MODULES_PATH
+
+  # pyexecdir is the path that contains shared objects used by the extra modules
+  pyexecdir=$PYTHON_EXEC_PREFIX/$PYTHON_MODULES_PATH
+
+  # If no PYTHON_CONFIG was specified by the user, try to find it, starting
+  # with the one specific to the configured python version.
+  AS_IF([test "x$PYTHON_CONFIG" = "x"], [
+    AC_CHECK_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config])
+  ])
+
+  # If PYTHON_CONFIG is set use it to get the includes and ld flags, unless
+  # they were specified by the user.
+  AS_IF([test "x$PYTHON_CONFIG" != "x" ], [
+    AS_IF([test "x$PYTHON_INCLUDE" = "x"], [
+      AC_MSG_CHECKING([Python include flags])
+      PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
+      AC_MSG_RESULT([$PYTHON_INCLUDE])
+    ])
+
+    AS_IF([test "x$PYTHON_LDFLAGS" = "x"], [
+      AC_MSG_CHECKING([Python library flags])
+      # Python 3.8+ requires that we pass --embed to get the -lpython3.x flag.
+      AS_IF([! PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags --embed`], [
+        PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+      ])
+      AC_MSG_RESULT([$PYTHON_LDFLAGS])
+    ])
+  ])
+], [:])
+
+# Initialize and configure libtool
+LT_INIT([win32-dll])
+
 
 ##                ##
 ## Library checks ##
@@ -262,30 +310,30 @@ AC_FUNC_MMAP
 AC_FUNC_STRERROR_R
 AC_FUNC_STRNLEN
 AC_CHECK_FUNCS([ \
-	atexit \
-	dup2 \
-	ftruncate \
-	gethostbyname \
-	gettimeofday \
-	localtime_r \
-	memchr \
-	memset \
-	mkdir \
-	mkdtemp \
-	munmap \
-	rmdir \
-	setenv \
-	socket \
-	strchr \
-	strdup \
-	strerror \
-	strndup \
-	strnlen \
-	strrchr \
-	strstr \
-	strtoul \
-	strtoull \
-	tzset \
+  atexit \
+  dup2 \
+  ftruncate \
+  gethostbyname \
+  gettimeofday \
+  localtime_r \
+  memchr \
+  memset \
+  mkdir \
+  mkdtemp \
+  munmap \
+  rmdir \
+  setenv \
+  socket \
+  strchr \
+  strdup \
+  strerror \
+  strndup \
+  strnlen \
+  strrchr \
+  strstr \
+  strtoul \
+  strtoull \
+  tzset \
 ])
 
 # AC_FUNC_MALLOC causes problems when cross-compiling.
@@ -307,6 +355,7 @@ AC_CHECK_LIB([c], [posix_fallocate],
   [AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_POSIX_FALLOCATE], 1, [Has posix_fallocate support.])]
 )
 
+
 ##                 ##
 ## User variables  ##
 ##                 ##
@@ -336,13 +385,14 @@ AC_DEFINE_UNQUOTED([BT_MINIMAL_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL
 # BABELTRACE_DEV_MODE:
 AC_ARG_VAR([BABELTRACE_DEV_MODE], [Set to 1 to enable the Babeltrace developer mode (enables run-time checks for plugin developers)])
 AS_IF([test "x$BABELTRACE_DEV_MODE" = x1], [
-	AC_DEFINE([BT_DEV_MODE], 1, [Babeltrace developer mode])
+  AC_DEFINE([BT_DEV_MODE], 1, [Babeltrace developer mode])
 ], [BABELTRACE_DEV_MODE=0])
+AM_CONDITIONAL([DEV_MODE], [test "x$BABELTRACE_DEV_MODE" = x1])
 
 # BABELTRACE_DEBUG_MODE:
 AC_ARG_VAR([BABELTRACE_DEBUG_MODE], [Set to 1 to enable the Babeltrace debug mode (enables internal assertions for Babeltrace maintainers)])
 AS_IF([test "x$BABELTRACE_DEBUG_MODE" = x1], [
-	AC_DEFINE([BT_DEBUG_MODE], 1, [Babeltrace debug mode])
+  AC_DEFINE([BT_DEBUG_MODE], 1, [Babeltrace debug mode])
 ], [BABELTRACE_DEBUG_MODE=0])
 
 
@@ -352,203 +402,177 @@ AS_IF([test "x$BABELTRACE_DEBUG_MODE" = x1], [
 
 # Python bindings
 # Disabled by default
-AC_ARG_ENABLE([python-bindings],
-  [AC_HELP_STRING([--enable-python-bindings], [build the Python bindings])],
-  [], dnl AC_ARG_ENABLE will fill enable_python_bindings with the user choice
-  [enable_python_bindings=no]
-)
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([python-bindings],[build the Python bindings])
 
 # 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]
-)
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([python-bindings-doc],[build the Python bindings documentation])
 
 # Python plugins
 # Disabled by default
-AC_ARG_ENABLE([python-plugins],
-  [AC_HELP_STRING([--enable-python-plugins], [enable the Python plugins support for the library and converter])],
-  [], dnl AC_ARG_ENABLE will fill enable_python_plugins with the user choice
-  [enable_python_plugins=no]
-)
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([python-plugins],[enable the Python plugins support for the library and converter])
 
 # Debug info
 # Enabled by default, except on some platforms
-AC_ARG_ENABLE([debug-info],
-  [AC_HELP_STRING([--disable-debug-info], [disable the debug info support (default on macOS, Solaris and Windows)])],
-  [], dnl AC_ARG_ENABLE will fill enable_debug_info with the user choice
-  [enable_debug_info="$DEFAULT_ENABLE_DEBUG_INFO"]
-)
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([debug-info],[disable the debug info support (default on macOS, Solaris and Windows)])
 
 # API documentation
 # Disabled by default
-AC_ARG_ENABLE([api-doc],
-  [AC_HELP_STRING([--enable-api-doc], [build the HTML API documentation])],
-  [enable_api_doc=$enableval],
-  [enable_api_doc=no]
-)
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([api-doc],[build the HTML API documentation])
 
 # Built-in plugins
 # Disabled by default
-AC_ARG_ENABLE([built-in-plugins],
-  [AC_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace2 executable])],
-  [], dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
-  [enable_built_in_plugins=no]
-)
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([built-in-plugins],[Statically-link in-tree plug-ins into the babeltrace2 executable])
 
 # Built-in python plugin support
 # Disabled by default
-AC_ARG_ENABLE([built-in-python-plugin-support],
-  [AC_HELP_STRING([--enable-built-in-python-plugin-support], [Statically-link Python plugin support into the babeltrace library])],
-  [], dnl AC_ARG_ENABLE will fill enable_built_in_python_plugin_support with the user choice
-  [enable_built_in_python_plugin_support=no]
-)
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([built-in-python-plugin-support],[Statically-link Python plugin support into the babeltrace library])
 
 # Man pages
 # Enabled by default
-AC_ARG_ENABLE([man-pages],
-  [AS_HELP_STRING([--disable-man-pages], [Do not build and install man pages (already built in a distributed tarball])],
-  [], dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
-  [enable_man_pages=yes]
-)
-
-
-# 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])
-AM_CONDITIONAL([ENABLE_BUILT_IN_PLUGINS], [test "x$enable_built_in_plugins" = xyes])
-AM_CONDITIONAL([ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$enable_built_in_python_plugin_support" = xyes])
-AM_CONDITIONAL([ENABLE_MAN_PAGES], [test "x$enable_man_pages" = xyes])
-AM_CONDITIONAL([ENABLE_PYTHON_COMMON_DEPS], [test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes])
-
-# Set defines for optionnal features conditionnals in the source code
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([man-pages],[Do not build and install man pages (already built in a distributed tarball])
 
-## jgalar: still used?
-AS_IF([test "x$enable_python_plugins" = xyes],
-  [AC_DEFINE([PYTHON_PLUGINS], [1], [Python plugin support.])]
-)
+# When given, add -Werror to WARN_CFLAGS and WARN_CXXFLAGS.
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([Werror],[Treat compiler warnings as errors.])
+
+# When given, build with AddressSanitizer.
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([asan],[Build with AddressSanitizer.])
+
+##                                          ##
+## Check for conflicting features selection ##
+##                                          ##
+
+# Check for conflicting Python related features user choices.
+AE_IF_FEATURE_ENABLED([python-plugins], [
+  AE_IF_FEATURE_UNDEF([python-bindings], [
+    # --enable-python-plugins was provided but --enable-python-bindings was
+    # omitted. Turn the Python bindings ON anyway because it's needed to
+    # use the Python plugins.
+    AE_FEATURE_ENABLE([python-bindings])
+  ], [
+    AE_IF_FEATURE_DISABLED([python-bindings], [
+      # --enable-python-plugins _and_ --disable-python-bindings were
+      # used. This is invalid because Python plugins need the Python
+      # bindings to be useful.
+      AC_MSG_ERROR(--enable-python-bindings must be used to support Python plugins)
+    ])
+  ])
+])
 
-AS_IF([test "x$enable_debug_info" = xyes],
-  [AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])]
-)
+# Check for conflicting optional features user choices
+AE_IF_FEATURE_ENABLED([built-in-plugins], [
+  # Built-in plug-ins are only available when the --disable-shared --enable-static options are used.
+  AE_IF_FEATURE_NOT_ENABLED([static], [AC_MSG_ERROR(--enable-static must be used to bundle plug-ins in the babeltrace2 executable)])
+  AE_IF_FEATURE_ENABLED([shared], [AC_MSG_ERROR(--disable-shared must be used to bundle plug-ins in the babeltrace2 executable)])
+])
 
-AS_IF([test "x$enable_built_in_plugins" = xyes],
-  [AC_DEFINE([BT_BUILT_IN_PLUGINS], [1], [Define to 1 to register plug-in attributes in static executable sections])]
-)
+AE_IF_FEATURE_ENABLED([built-in-python-plugin-support], [
+  AE_IF_FEATURE_NOT_ENABLED([python-plugins], [AC_MSG_ERROR([--enable-python-plugins must be used to bundle Python plugin support in the babeltrace2 executable])])
+  # Built-in plug-ins are only available when the --disable-shared --enable-static options are used.
+  AE_IF_FEATURE_NOT_ENABLED([static], [AC_MSG_ERROR(--enable-static must be used to bundle Python plugin support in the babeltrace2 executable)])
+  AE_IF_FEATURE_ENABLED([shared], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace2 executable)])
+])
 
-AS_IF([test "x$enable_built_in_python_plugin_support" = xyes],
-  [AC_DEFINE([BT_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [1], [Define to 1 to register plug-in attributes in static executable sections])]
-)
 
-AS_IF([test "x$enable_debug_info" = xyes],
-  [ENABLE_DEBUG_INFO_VAL=1],
-  [ENABLE_DEBUG_INFO_VAL=0]
-)
+##                                                                          ##
+## Set automake variables for optional feature conditionnals in Makefile.am ##
+##                                                                          ##
 
-AC_SUBST([ENABLE_DEBUG_INFO_VAL])
+AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS], AE_IS_FEATURE_ENABLED([python-bindings]))
+AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_DOC], AE_IS_FEATURE_ENABLED([python-bindings-doc]))
+AM_CONDITIONAL([ENABLE_PYTHON_PLUGINS], AE_IS_FEATURE_ENABLED([python-plugins]))
+AM_CONDITIONAL([ENABLE_DEBUG_INFO], AE_IS_FEATURE_ENABLED([debug-info]))
+AM_CONDITIONAL([ENABLE_API_DOC], AE_IS_FEATURE_ENABLED([api-doc]))
+AM_CONDITIONAL([ENABLE_BUILT_IN_PLUGINS], AE_IS_FEATURE_ENABLED([built-in-plugins]))
+AM_CONDITIONAL([ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT], AE_IS_FEATURE_ENABLED([built-in-python-plugin-support]))
+AM_CONDITIONAL([ENABLE_MAN_PAGES], AE_IS_FEATURE_ENABLED([man-pages]))
+AM_CONDITIONAL([ENABLE_PYTHON_COMMON_DEPS], AE_IS_FEATURE_ENABLED([python-bindings]) || AE_IS_FEATURE_ENABLED([python-plugins]))
+AM_CONDITIONAL([ENABLE_ASAN], AE_IS_FEATURE_ENABLED([asan]))
 
 
-# Check for conflicting optional features user choices
+##                                                                    ##
+## Set defines for optional features conditionnals in the source code ##
+##                                                                    ##
 
-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])])
-  ]
+AE_IF_FEATURE_ENABLED([built-in-plugins],
+  [AC_DEFINE([BT_BUILT_IN_PLUGINS], [1], [Define to 1 to register plug-in attributes in static executable sections])]
 )
 
-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_static" != xyes], [AC_MSG_ERROR(--enable-static must be used to bundle plug-ins in the babeltrace2 executable)])
-    AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle plug-ins in the babeltrace2 executable)])
-  ]
+AE_IF_FEATURE_ENABLED([built-in-python-plugin-support],
+  [AC_DEFINE([BT_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [1], [Define to 1 to register plug-in attributes in static executable sections])]
 )
 
-AS_IF([test "x$enable_built_in_python_plugin_support" = xyes],
-  [
-    AS_IF([test "x$enable_python_plugins" = xno], [AC_MSG_ERROR([--enable-python-plugins must be used to bundle Python plugin support in the babeltrace2 executable])])
-    # Built-in plug-ins are only available when the --disable-shared --enable-static options are used.
-    AS_IF([test "x$enable_static" != xyes], [AC_MSG_ERROR(--enable-static must be used to bundle Python plugin support in the babeltrace2 executable)])
-    AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace2 executable)])
-  ]
-)
+AE_IF_FEATURE_ENABLED([debug-info], [ENABLE_DEBUG_INFO_VAL=1], [ENABLE_DEBUG_INFO_VAL=0])
+AC_SUBST([ENABLE_DEBUG_INFO_VAL])
 
+AE_IF_FEATURE_ENABLED([asan], [ENABLE_ASAN=1], [ENABLE_ASAN=0])
+AC_SUBST([ENABLE_ASAN])
 
-# Check for optionnal features dependencies
+##                                          ##
+## Check for optional features dependencies ##
+##                                          ##
 
-AS_IF([test "x$enable_python_bindings" = xyes],
+# The Python bindings require SWIG
+AE_IF_FEATURE_ENABLED([python-bindings],
   [AX_PKG_SWIG(2.0.0, [], [AC_MSG_ERROR([SWIG 2.0.0 or newer is required to build the python bindings])])]
 )
 
-AM_PATH_PYTHON([3.0], [
-  AM_PATH_PYTHON_MODULES([PYTHON])
-
-  # pythondir is the path where extra modules are to be installed
-  pythondir=$PYTHON_PREFIX/$PYTHON_MODULES_PATH
-
-  # pyexecdir is the path that contains shared objects used by the extra modules
-  pyexecdir=$PYTHON_EXEC_PREFIX/$PYTHON_MODULES_PATH
-
-  AS_IF([test -z "$PYTHON_CONFIG"], [
-    AC_PATH_PROGS([PYTHON_CONFIG],
-                  [python$PYTHON_VERSION-config python-config],
-                  [],
-                  [`dirname $PYTHON`])
-  ])
-
-  AS_IF([test -n "$PYTHON_CONFIG"], [
-    AS_IF([test -z "$PYTHON_INCLUDE"], [
-      AC_MSG_CHECKING([Python include flags])
-      PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
-      AC_MSG_RESULT([$PYTHON_INCLUDE])
-    ])
-
-    AS_IF([test -z "$PYTHON_LDFLAGS"], [
-      AC_MSG_CHECKING([Python library flags])
-      PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-      AC_MSG_RESULT([$PYTHON_LDFLAGS])
-    ])
-  ])
-], [:])
-
 AS_IF([test "$PYTHON" != :], [have_python=yes], [have_python=no])
 AS_IF([test -n "$PYTHON_CONFIG"], [have_python_dev=yes], [have_python_dev=no])
 
 AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = xyes])
 AM_CONDITIONAL([HAVE_PYTHON_DEV], [test "x$have_python_dev" = xyes])
 
-AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes], [
+AS_IF([AE_IS_FEATURE_ENABLED([python-bindings]) || AE_IS_FEATURE_ENABLED([python-plugins])], [
   AS_IF([test "x$have_python_dev" = xno], [
     AC_MSG_ERROR([Cannot find a suitable python-config. You can override the python-config path with the PYTHON_CONFIG environment variable.])
   ])
 ])
 
-AS_IF([test "x$enable_python_bindings_doc" = xyes],
+AE_IF_FEATURE_ENABLED([python-bindings-doc],
   [
-    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])]
-    )
-  ]
-)
+    AE_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
-    AC_CHECK_LIB([elf], [elf_version], [:], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
-    AC_CHECK_LIB([dw], [dwarf_begin], [:], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
-    BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
-    ELFUTILS_LIBS="-lelf -ldw"
+    AE_IF_FEATURE_NOT_ENABLED([python-bindings], [
+      AC_MSG_ERROR([The Python bindings are required to build their documentation])
+    ])
   ]
 )
+
+AE_IF_FEATURE_ENABLED([debug-info], [
+  # Check if libelf and libdw are present
+  PKG_CHECK_MODULES([ELFUTILS], [libelf >= 0.154 libdw >= 0.154],
+    [
+      dnl PKG_CHECK_MODULES defines ELFUTILS_LIBS
+    ],
+    [
+      AC_MSG_WARN([pkg-config was unable to find a valid .pc for libelf/libdw. Set PKG_CONFIG_PATH to specify the pkg-config configuration file location.])
+
+      # Turns out SLES12 doesn't bother shipping .pc file for libelf
+      AC_MSG_WARN([Finding libelf without pkg-config.])
+      AC_CHECK_LIB([elf], [elf_version], [:], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+      AC_CHECK_LIB([dw], [dwarf_begin], [:], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+      AE_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
+      ELFUTILS_LIBS="-lelf -ldw"
+    ])
+])
 AC_SUBST([ELFUTILS_LIBS])
 
-AS_IF([test "x$enable_api_doc" = "xyes"],
+AE_IF_FEATURE_ENABLED([api-doc],
   [
     DX_DOXYGEN_FEATURE(ON)
     DX_DOT_FEATURE(OFF)
@@ -560,9 +584,9 @@ 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])]
+      [AC_MSG_ERROR([You need doxygen to enable the API documentation])]
     )
   ]
 )
@@ -570,12 +594,9 @@ AS_IF([test "x$enable_api_doc" = "xyes"],
 have_asciidoc_xmlto=no
 warn_prebuilt_man_pages=no
 
-AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
-AC_PATH_PROG([XMLTO], [xmlto], [no])
-
-AS_IF([test "x$enable_man_pages" = "xyes"], [
-  AS_IF([test "x$ASCIIDOC" = "xno" || test "x$XMLTO" = "xno"], [
-    AS_IF([test "x$in_git_repo" = "xyes"], [
+AE_IF_FEATURE_ENABLED([man-pages], [
+  AS_IF([test "x$ASCIIDOC" = "x" || test "x$XMLTO" = "x"], [
+    AE_IF_IN_GIT_REPO([
       # this is an error because we're in the Git repo, which
       # means the man pages are not already generated for us,
       # thus asciixmlto are required because we were asked
@@ -616,9 +637,21 @@ AS_IF([test "x$exec_prefix" = xNONE], [
 
 AC_SUBST(LIBDIR)
 
+# If --enable-asan is used...
+AE_IF_FEATURE_ENABLED([asan], [
+  # ... add -fsanitize=address to the *FLAGS variables.
+  ASAN_CFLAGS="-fsanitize=address"
+  ASAN_CXXFLAGS="-fsanitize=address"
+  ASAN_LDFLAGS="-fsanitize=address"
+])
+
+
+
 # CFLAGS from libraries (the glib ones are needed for the following sizeof
 # test).
-AM_CFLAGS="${PTHREAD_CFLAGS} ${GLIB_CFLAGS}"
+AM_CFLAGS="${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${ASAN_CFLAGS}"
+AM_CXXFLAGS="${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${ASAN_CXXFLAGS}"
+AM_LDFLAGS="${ASAN_LDFLAGS}"
 
 # Check that the current size_t matches the size that glib thinks it should
 # be. This catches problems on multi-arch where people try to do a 32-bit
@@ -654,54 +687,76 @@ target.
 CFLAGS=${save_CFLAGS}
 
 # Detect C and LD warning flags supported by the compiler.
-AX_COMPILER_FLAGS(
-	[WARN_CFLAGS], dnl CFLAGS variable name
-	[WARN_LDFLAGS], dnl LDFLAGS variable name (unused for now)
-	[], dnl is-release
-	[], dnl Extra base CFLAGS
-	[ dnl Extra "yes" CFLAGS
-		dnl Disable these flags, either because we don't want them
-		dnl or because we want them but are not ready to enable them
-		dnl yet.
-		-Wno-sign-compare dnl
-		-Wno-inline dnl
-		-Wno-declaration-after-statement dnl
-		-Wno-switch-enum dnl
-		-Wno-switch-default dnl
-		-Wno-packed dnl
-		-Wno-pointer-arith dnl
-		-Wno-format-nonliteral dnl
-		-Wno-undef dnl
-		-Wno-missing-prototypes dnl
-		-Wno-missing-declarations dnl
-		-Wno-redundant-decls dnl
-		-Wno-logical-op dnl
-		-Wno-shadow dnl
-		-Wno-null-dereference dnl
-		-Wno-jump-misses-init dnl
-		-Wno-double-promotion dnl
-		-Wno-cast-align dnl
-	])
-
-# CFLAGS from AX_COMPILER_FLAGS.
-AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
 
-# The test used in AX_COMPILER_FLAGS, generated using AC_LANG_PROGRAM, is
-# written in such a way that it triggers a -Wold-style-definition warning.  So
-# if the user has -Werror in their CFLAGS, that warning flag will end up
-# disabled, because the test program will not build.
+# Detect warning flags supported by the C and C++ compilers and append them to
+# WARN_CFLAGS and WARN_CXXFLAGS.
 #
-# Enable it here unconditionally.  It is supported by GCC >= 4.8 and by Clang
-# (it is accepted for compatibility although it has no effect), and there is
-# not reason to not want it.
+m4_define([WARN_FLAGS_LIST], [ dnl
+  -Wall dnl
+  -Wextra dnl
+  -Wmissing-prototypes dnl
+  -Wmissing-declarations dnl
+  -Wnull-dereference dnl
+  -Wundef dnl
+  -Wredundant-decls dnl
+  -Wshadow dnl
+  -Wjump-misses-init dnl
+  -Wsuggest-attribute=format dnl
+  -Wtautological-constant-out-of-range-compare dnl
+  -Wnested-externs dnl
+  -Wwrite-strings dnl
+  -Wformat=2 dnl
+  -Wstrict-aliasing dnl
+  -Wmissing-noreturn dnl
+  -Winit-self dnl
+  -Wduplicated-cond dnl
+  -Wduplicated-branches dnl
+  -Wlogical-op dnl
+  -Wno-unused-parameter dnl
+  -Wno-sign-compare dnl
+  dnl
+  dnl Some versions of SWIG (like 3.0.12) generate code that produces
+  dnl -Wcast-function-type warnings.  This warning is present in gcc >= 8.  This
+  dnl combo happens on RHEL/Centos 8, for example.  Later versions of SWIG (like
+  dnl 4.0.1) have the correct function signatures to not produce this warning.
+  dnl It's simpler to just disable the warning globally.
+  dnl
+  dnl Note that the Debian/Ubuntu SWIG package 3.0.12-2 contains a local patch to
+  dnl fix this (python-fix-function-cast-warnings.patch), so you won't be able to
+  dnl reproduce the warning using that package.
+  dnl
+  dnl Ref: https://github.com/swig/swig/issues/1259
+  -Wno-cast-function-type dnl
+  -Wno-missing-field-initializers dnl
+])
+
+# Pass -Werror as an extra flag during the test: this is needed to make the
+# -Wunknown-warning-option diagnostic fatal with clang.
+AC_LANG([C++])
+AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST], [WARN_CXXFLAGS], [-Werror])
+AC_LANG([C])
+AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST], [WARN_CFLAGS], [-Werror])
 
-AM_CFLAGS="${AM_CFLAGS} -Wold-style-definition"
+AE_IF_FEATURE_ENABLED([Werror], [WARN_CXXFLAGS="${WARN_CXXFLAGS} -Werror"])
+AE_IF_FEATURE_ENABLED([Werror], [WARN_CFLAGS="${WARN_CFLAGS} -Werror"])
 
-# We want this one to always be an error.
-AM_CFLAGS="${AM_CFLAGS} -Werror=implicit-function-declaration"
+# The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is
+# written in such a way that it triggers warnings with the following warning
+# flags.  So they would always end up disabled if we put them there, because
+# the test program would not build.
+#
+# Enable them here unconditionally.  They are supported by GCC >= 4.8 and by
+# Clang >= 3.3 (required by the project) and are only valid for C code.
+WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition -Wstrict-prototypes"
+
+# CFLAGS from AX_APPEND_COMPILE_FLAGS.
+AM_CXXFLAGS="${AM_CXXFLAGS} ${WARN_CXXFLAGS}"
+AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
 
-# Done for AM_CFLAGS.
+# Done for AM_CXXFLAGS, AM_CFLAGS and AM_LDFLAGS.
+AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
 
 # Set global CPPFLAGS in AM_CPPFLAGS
 AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
@@ -716,85 +771,91 @@ 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/bindings/Makefile
-	doc/bindings/python/Makefile
-	doc/contributing-images/Makefile
-	doc/Makefile
-	doc/man/asciidoc-attrs.conf
-	doc/man/Makefile
-	include/Makefile
-	Makefile
-	src/argpar/Makefile
-	src/autodisc/Makefile
-	src/babeltrace2-ctf-writer.pc
-	src/babeltrace2.pc
-	src/bindings/Makefile
-	src/bindings/python/bt2/bt2/version.py
-	src/bindings/python/bt2/Makefile
-	src/bindings/python/bt2/setup.py
-	src/bindings/python/Makefile
-	src/cli/Makefile
-	src/common/Makefile
-	src/compat/Makefile
-	src/ctfser/Makefile
-	src/ctf-writer/Makefile
-	src/fd-cache/Makefile
-	src/lib/graph/Makefile
-	src/lib/graph/message/Makefile
-	src/lib/Makefile
-	src/lib/plugin/Makefile
-	src/lib/prio-heap/Makefile
-	src/lib/trace-ir/Makefile
-	src/logging/Makefile
-	src/Makefile
-	src/plugins/common/Makefile
-	src/plugins/common/muxing/Makefile
-	src/plugins/common/param-validation/Makefile
-	src/plugins/ctf/common/bfcr/Makefile
-	src/plugins/ctf/common/Makefile
-	src/plugins/ctf/common/metadata/Makefile
-	src/plugins/ctf/common/msg-iter/Makefile
-	src/plugins/ctf/fs-sink/Makefile
-	src/plugins/ctf/fs-src/Makefile
-	src/plugins/ctf/lttng-live/Makefile
-	src/plugins/ctf/Makefile
-	src/plugins/lttng-utils/debug-info/Makefile
-	src/plugins/lttng-utils/Makefile
-	src/plugins/Makefile
-	src/plugins/text/dmesg/Makefile
-	src/plugins/text/Makefile
-	src/plugins/text/pretty/Makefile
-	src/plugins/text/details/Makefile
-	src/plugins/utils/counter/Makefile
-	src/plugins/utils/dummy/Makefile
-	src/plugins/utils/Makefile
-	src/plugins/utils/muxer/Makefile
-	src/plugins/utils/trimmer/Makefile
-	src/py-common/Makefile
-	src/python-plugin-provider/Makefile
-	src/param-parse/Makefile
-	tests/bitfield/Makefile
-	tests/ctf-writer/Makefile
-	tests/argpar/Makefile
-	tests/lib/Makefile
-	tests/lib/test-plugin-plugins/Makefile
-	tests/Makefile
-	tests/param-validation/Makefile
-	tests/plugins/Makefile
-	tests/plugins/src.ctf.fs/Makefile
-	tests/plugins/src.ctf.fs/succeed/Makefile
-	tests/plugins/sink.ctf.fs/Makefile
-	tests/plugins/sink.ctf.fs/succeed/Makefile
-	tests/plugins/flt.lttng-utils.debug-info/Makefile
-	tests/plugins/flt.utils.muxer/Makefile
-	tests/plugins/flt.utils.muxer/succeed/Makefile
-	tests/plugins/flt.utils.trimmer/Makefile
-	tests/utils/Makefile
-	tests/utils/tap/Makefile
+  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
+  doc/man/Makefile
+  include/Makefile
+  Makefile
+  src/argpar/Makefile
+  src/autodisc/Makefile
+  src/babeltrace2-ctf-writer.pc
+  src/babeltrace2.pc
+  src/bindings/Makefile
+  src/bindings/python/bt2/bt2/version.py
+  src/bindings/python/bt2/Makefile
+  src/bindings/python/bt2/setup.py
+  src/bindings/python/Makefile
+  src/cli/Makefile
+  src/common/Makefile
+  src/cpp-common/Makefile
+  src/compat/Makefile
+  src/ctfser/Makefile
+  src/ctf-writer/Makefile
+  src/fd-cache/Makefile
+  src/lib/graph/Makefile
+  src/lib/graph/message/Makefile
+  src/lib/Makefile
+  src/lib/plugin/Makefile
+  src/lib/prio-heap/Makefile
+  src/lib/trace-ir/Makefile
+  src/logging/Makefile
+  src/Makefile
+  src/plugins/common/Makefile
+  src/plugins/common/muxing/Makefile
+  src/plugins/common/param-validation/Makefile
+  src/plugins/ctf/common/bfcr/Makefile
+  src/plugins/ctf/common/Makefile
+  src/plugins/ctf/common/metadata/Makefile
+  src/plugins/ctf/common/msg-iter/Makefile
+  src/plugins/ctf/fs-sink/Makefile
+  src/plugins/ctf/fs-src/Makefile
+  src/plugins/ctf/lttng-live/Makefile
+  src/plugins/ctf/Makefile
+  src/plugins/lttng-utils/debug-info/Makefile
+  src/plugins/lttng-utils/Makefile
+  src/plugins/Makefile
+  src/plugins/text/dmesg/Makefile
+  src/plugins/text/Makefile
+  src/plugins/text/pretty/Makefile
+  src/plugins/text/details/Makefile
+  src/plugins/utils/counter/Makefile
+  src/plugins/utils/dummy/Makefile
+  src/plugins/utils/Makefile
+  src/plugins/utils/muxer/Makefile
+  src/plugins/utils/trimmer/Makefile
+  src/py-common/Makefile
+  src/python-plugin-provider/Makefile
+  src/param-parse/Makefile
+  src/string-format/Makefile
+  tests/bitfield/Makefile
+  tests/ctf-writer/Makefile
+  tests/lib/Makefile
+  tests/lib/test-plugin-plugins/Makefile
+  tests/lib/conds/Makefile
+  tests/Makefile
+  tests/param-validation/Makefile
+  tests/plugins/Makefile
+  tests/plugins/src.ctf.fs/Makefile
+  tests/plugins/src.ctf.fs/succeed/Makefile
+  tests/plugins/sink.ctf.fs/Makefile
+  tests/plugins/sink.ctf.fs/succeed/Makefile
+  tests/plugins/flt.lttng-utils.debug-info/Makefile
+  tests/plugins/flt.utils.muxer/Makefile
+  tests/plugins/flt.utils.muxer/succeed/Makefile
+  tests/plugins/flt.utils.trimmer/Makefile
+  tests/plugins/sink.text.pretty/Makefile
+  tests/utils/Makefile
+  tests/utils/tap/Makefile
 ])
 
+AC_CONFIG_FILES([tests/utils/env.sh],[chmod +x tests/utils/env.sh])
+
 AC_OUTPUT
 
 #
@@ -806,20 +867,36 @@ 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 "$FOLD"], [
+    AS_ECHO("`AS_ECHO("bt_version_description") | $FOLD -s`")
+  ], [
+    AS_ECHO("bt_version_description")
+  ])
+
+  AS_ECHO
+])
+
 PPRINT_SUBTITLE([System])
 
 # Target architecture we're building for.
 target_arch=$host_cpu
 [
 for f in $CFLAGS; do
-	if test $f = "-m32"; then
-		target_arch="32-bit"
-	elif test $f = "-m64"; then
-		target_arch="64-bit"
-	fi
+  if test $f = "-m32"; then
+    target_arch="32-bit"
+  elif test $f = "-m64"; then
+    target_arch="64-bit"
+  fi
 done
 ]
 
@@ -832,9 +909,9 @@ PPRINT_PROP_BOOL([Have Python interpreter], $value)
 test "x$have_python_dev" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Have Python development libraries], $value)
 test "x$enable_python_bindings" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Python bindings], $value)
+PPRINT_PROP_BOOL_CUSTOM([Python bindings], $value, [To enable, use --enable-python-bindings])
 test "x$enable_python_plugins" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Python plugin support], $value)
+PPRINT_PROP_BOOL_CUSTOM([Python plugin support], $value, [To enable, use --enable-python-plugins])
 AS_IF([test "x$have_python" = "xyes"], [
   PPRINT_PROP_STRING([Python interpreter path], [$PYTHON])
 ])
@@ -843,7 +920,7 @@ AS_IF([test "x$have_python_dev" = "xyes"], [
   PPRINT_PROP_STRING([Python include paths], [$PYTHON_INCLUDE])
   PPRINT_PROP_STRING([Python linker flags], [$PYTHON_LDFLAGS])
 ])
-AS_IF([test "x$enable_python_bindings" = "xyes"], [
+AE_IF_FEATURE_ENABLED([python-bindings], [
   PPRINT_PROP_STRING([SWIG executable], [$SWIG])
   PPRINT_PROP_STRING([SWIG library], [$SWIG_LIB])
 ])
@@ -852,16 +929,16 @@ AS_ECHO
 PPRINT_SUBTITLE([Plugins])
 PPRINT_PROP_BOOL(['ctf' plugin], 1)
 test "x$enable_debug_info" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL(['lttng-utils' plugin], $value)
+PPRINT_PROP_BOOL_CUSTOM(['lttng-utils' plugin], $value, [To enable, use --enable-debug-info])
 PPRINT_PROP_BOOL(['text' plugin], 1)
 PPRINT_PROP_BOOL(['utils' plugin], 1)
 
 AS_ECHO
 PPRINT_SUBTITLE([Built-in features])
 test "x$enable_built_in_plugins" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Built-in plugins], $value)
+PPRINT_PROP_BOOL_CUSTOM([Built-in plugins], $value, [To enable, use --enable-built-in-plugins])
 test "x$enable_built_in_python_plugin_support" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Built-in Python plugin support], $value)
+PPRINT_PROP_BOOL_CUSTOM([Built-in Python plugin support], $value, [To enable, use --enable-built-in-python-plugin-support])
 
 AS_ECHO
 PPRINT_SUBTITLE([Documentation])
@@ -869,8 +946,8 @@ PPRINT_SUBTITLE([Documentation])
 # man pages build enabled/disabled
 m4_pushdef([build_man_pages_msg], [Build and install man pages])
 
-AS_IF([test "x$enable_man_pages" != "xno"], [
-  AS_IF([test "x$in_git_repo" = "xyes"], [
+AE_IF_FEATURE_ENABLED([man-pages], [
+  AE_IF_IN_GIT_REPO([
     PPRINT_PROP_BOOL([build_man_pages_msg], 1)
   ], [
     AS_IF([test "x$have_asciidoc_xmlto" = "xyes"], [
@@ -882,15 +959,15 @@ AS_IF([test "x$enable_man_pages" != "xno"], [
     ])
   ])
 ], [
-  PPRINT_PROP_BOOL([build_man_pages_msg], 0)
+  PPRINT_PROP_BOOL_CUSTOM([build_man_pages_msg], 0, [To build man pages, use --enable-man-pages])
 ])
 
 m4_popdef([build_man_pages_msg])
 
 test "x$enable_api_doc" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([HTML API documentation], $value)
+PPRINT_PROP_BOOL_CUSTOM([HTML API documentation], $value, [To build documentation, use --enable-api-doc])
 test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL([Python bindings documentation], $value)
+PPRINT_PROP_BOOL_CUSTOM([Python bindings documentation], $value, [To build the Python bindings documentation, use --enable-python-bindings-doc])
 
 AS_ECHO
 PPRINT_SUBTITLE([Logging])
@@ -898,8 +975,8 @@ PPRINT_PROP_STRING([Minimal log level], $BABELTRACE_MINIMAL_LOG_LEVEL)
 
 AS_ECHO
 PPRINT_SUBTITLE([Special build modes])
-PPRINT_PROP_BOOL([Debug mode], $BABELTRACE_DEBUG_MODE)
-PPRINT_PROP_BOOL([Developer mode], $BABELTRACE_DEV_MODE)
+PPRINT_PROP_BOOL_CUSTOM([Debug mode], $BABELTRACE_DEBUG_MODE, [To enable, set the BABELTRACE_DEBUG_MODE environment variable to 1])
+PPRINT_PROP_BOOL_CUSTOM([Developer mode], $BABELTRACE_DEV_MODE, [To enable, set the BABELTRACE_DEV_MODE environment variable to 1])
 
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"
@@ -915,3 +992,5 @@ PPRINT_PROP_STRING([Libraries], [$report_libdir])
 PPRINT_PROP_STRING([Plugins], [$report_pluginsdir])
 PPRINT_PROP_STRING([Plugin providers], [$report_pluginprovidersdir])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])
+
+# vim: shiftwidth=2 softtabstop=2 expandtab