Enable autotools warnings as errors
[babeltrace.git] / configure.ac
index c265be674393e9202eb46320f010ba3675e0558b..7808ef451ba5440398b9cc8784809f9cecb48efd 100644 (file)
@@ -1,38 +1,23 @@
-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.
+dnl Process this file with autoconf to produce a configure script.
 
 ##                     ##
 ## Autoconf base setup ##
 ##                     ##
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.69])
 
 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)
+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/])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -40,18 +25,21 @@ m4_define([bt_lib_version_current], [0])
 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)
+m4_define([bt_version_description], [])
+m4_define([bt_version_description_c_safe], AS_ESCAPE(bt_version_description))
 
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
 
 AC_CONFIG_HEADERS([src/common/config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
 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_c_safe["], [Babeltrace version description])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -61,11 +49,11 @@ AC_CANONICAL_HOST
 ## Automake base setup ##
 ##                     ##
 
-AM_INIT_AUTOMAKE([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])
 
 
 ##                      ##
@@ -101,14 +89,15 @@ AC_SUBST(LT_NO_UNDEFINED)
 ## C compiler checks ##
 ##                   ##
 
-AC_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
-
 # Choose the c compiler
-AC_PROG_CC
+AC_PROG_CC_STDC
 
 # Make sure the c compiler supports C99
-AC_PROG_CC_C99([], [AC_MSG_ERROR([The compiler does not support C99])])
+AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not support C99])])
+
+# Enable available system extensions and LFS support
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 
 # Make sure the c compiler supports __attributes__
 AX_C___ATTRIBUTE__
@@ -182,17 +171,17 @@ AX_CHECK_LINK_FLAG([-Wl,--whole-archive,--no-whole-archive],
   ]
 )
 
-# Initialize and configure libtool
-LT_INIT([win32-dll])
-
 
 ##                 ##
 ## Programs checks ##
 ##                 ##
 
+AM_PROG_AR
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
+AC_PROG_SED
+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
@@ -201,7 +190,7 @@ AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"])
 
 # check for bison
 AC_PROG_YACC
-AX_PROG_BISON_VERSION([2.4], [have_bison=yes])
+AX_PROG_BISON_VERSION([2.5], [have_bison=yes])
 
 AS_IF([test "x$have_bison" != "xyes"], [
   AS_IF([test "x$in_git_repo" = "xyes"], [
@@ -241,6 +230,9 @@ detection.
 ])
 AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
 
+# Initialize and configure libtool
+LT_INIT([win32-dll])
+
 
 ##                ##
 ## Library checks ##
@@ -249,9 +241,9 @@ AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
 # Check what libraries are required on this platform to link sockets programs.
 AX_LIB_SOCKET_NSL
 
-# Check for glib >= 2.22 with gmodule support
-AM_PATH_GLIB_2_0([2.22.0], [],
-  AC_MSG_ERROR([glib >= 2.22 is required - download it from ftp://ftp.gtk.org/pub/gtk]),
+# Check for glib >= 2.28 with gmodule support
+AM_PATH_GLIB_2_0([2.28.0], [],
+  AC_MSG_ERROR([glib >= 2.28 is required - download it from ftp://ftp.gtk.org/pub/gtk]),
   [gmodule-no-export]
 )
 
@@ -293,51 +285,6 @@ AC_CHECK_FUNCS([ \
 #AC_FUNC_MALLOC
 #AC_FUNC_REALLOC
 
-# First, check for uuid in system libs
-AH_TEMPLATE([BABELTRACE_HAVE_LIBUUID], [Define if you have libuuid support])
-AC_CHECK_FUNCS([uuid_generate],
-  [
-    AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-    UUID_LIBS=""
-  ],
-  [
-    # Then, check if the pkg-config module is available, otherwise explicitly check
-    # for libuuid, or uuid support in the C-library.
-    PKG_CHECK_MODULES([UUID], [uuid],
-      [
-        AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-        dnl PKG_CHECK_MODULES defines UUID_LIBS
-      ],
-      [
-        AC_MSG_WARN([pkg-config was unable to find a valid .pc for libuuid. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
-        AC_MSG_WARN([Finding libuuid without pkg-config.])
-        AC_CHECK_LIB([uuid], [uuid_generate],
-          [
-            AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-            UUID_LIBS="-luuid"
-          ],
-          [
-            # libuuid not found, check for uuid_create in libc.
-            AC_CHECK_LIB([c], [uuid_create],
-              [
-                AC_DEFINE([BABELTRACE_HAVE_LIBUUID], [1])
-                UUID_LIBS="-lc"
-              ],
-              [
-                # for MinGW32 we have our own internal implementation of uuid using Windows functions.
-                AS_IF([test "x$MINGW32" = xno],
-                  [AC_MSG_FAILURE([Cannot find libuuid uuid_generate nor libc uuid_create. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])]
-               )
-              ]
-            )
-          ]
-        )
-      ]
-    )
-  ]
-)
-AC_SUBST(UUID_LIBS)
-
 # Check for fmemopen
 AC_CHECK_LIB([c], [fmemopen],
   [AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_FMEMOPEN], 1, [Has fmemopen support.])]
@@ -353,60 +300,38 @@ AC_CHECK_LIB([c], [posix_fallocate],
   [AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_POSIX_FALLOCATE], 1, [Has posix_fallocate support.])]
 )
 
-# Check libpopt
-PKG_CHECK_MODULES([POPT], [popt],
-  [
-    dnl PKG_CHECK_MODULES defines POPT_LIBS
-  ],
-  [
-    AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
-    AC_MSG_WARN([Finding libpopt without pkg-config.])
-    AC_CHECK_LIB([popt],
-      [poptGetContext],
-      [POPT_LIBS="-lpopt"],
-      [
-        AC_MSG_FAILURE([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])
-      ]
-    )
-  ]
-)
-AC_SUBST(POPT_LIBS)
-
-
 ##                 ##
 ## User variables  ##
 ##                 ##
 
 AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for Python, bypassing python-config])
-AC_ARG_VAR([PYTHON_LIBS], [Library flags for Python, bypassing python-config])
+AC_ARG_VAR([PYTHON_LDFLAGS], [Linker flags for Python, bypassing python-config])
 AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
 
-# PLUGINSDIR: Plugins directory
-AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
-AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins'])
+# BABELTRACE_PLUGINS_DIR: Plugins directory
+AC_ARG_VAR([BABELTRACE_PLUGINS_DIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
+AS_IF([test "x$BABELTRACE_PLUGINS_DIR" = x], [BABELTRACE_PLUGINS_DIR='${libdir}/babeltrace2/plugins'])
+
+# BABELTRACE_PLUGIN_PROVIDERS_DIR: Plugin providers directory
+AC_ARG_VAR([BABELTRACE_PLUGIN_PROVIDERS_DIR], [built-in plugin providers install directory [LIBDIR/babeltrace2/plugin-providers]])
+AS_IF([test "x$BABELTRACE_PLUGIN_PROVIDERS_DIR" = x], [BABELTRACE_PLUGIN_PROVIDERS_DIR='${libdir}/babeltrace2/plugin-providers'])
 
 # BABELTRACE_MINIMAL_LOG_LEVEL:
-AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), INFO, WARN, ERROR, FATAL, or NONE)])
+AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), or INFO)])
 AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = x], [BABELTRACE_MINIMAL_LOG_LEVEL="DEBUG"])
 AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "TRACE" && \
        test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "DEBUG" && \
-       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO" && \
-       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "WARN" && \
-       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "ERROR" && \
-       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "FATAL" && \
-       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "NONE"],
-  [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use TRACE, DEBUG, INFO, WARN, ERROR, FATAL, or NONE.])]
+       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO"],
+  [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use TRACE, DEBUG, or INFO.])]
 )
-AC_DEFINE_UNQUOTED([BT_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level])
+AC_DEFINE_UNQUOTED([BT_MINIMAL_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [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], [
-       AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = "xNONE"], [
-               AC_MSG_ERROR([Babeltrace developer mode (\$BABELTRACE_DEV_MODE) needs \$BABELTRACE_MINIMAL_LOG_LEVEL to be at least FATAL.])
-       ])
        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)])
@@ -422,15 +347,15 @@ 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])],
+  [AS_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]
+  [enable_python_bindings=unspecified]
 )
 
 # Python bindings documentation
 # Disabled by default
 AC_ARG_ENABLE([python-bindings-doc],
-  [AC_HELP_STRING([--enable-python-bindings-doc], [build the Python bindings documentation])],
+  [AS_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]
 )
@@ -438,15 +363,14 @@ AC_ARG_ENABLE([python-bindings-doc],
 # 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]
+  [AS_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
 )
 
 # 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)])],
+  [AS_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"]
 )
@@ -454,32 +378,29 @@ AC_ARG_ENABLE([debug-info],
 # 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]
+  [AS_HELP_STRING([--enable-api-doc],[build the HTML API documentation])],
+  [enable_api_doc=$enableval]
 )
 
 # 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]
+  [AS_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
 )
 
 # 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]
+  [AS_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
 )
 
 # 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
+  [], dnl AC_ARG_ENABLE will fill enable_man_pages with the user choice
   [enable_man_pages=yes]
 )
 
@@ -493,19 +414,10 @@ 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
 
-## jgalar: still used?
-AS_IF([test "x$enable_python_plugins" = xyes],
-  [AC_DEFINE([PYTHON_PLUGINS], [1], [Python plugin support.])]
-)
-
-AS_IF([test "x$enable_debug_info" = xyes],
-  [AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])]
-)
-
 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])]
 )
@@ -521,15 +433,32 @@ AS_IF([test "x$enable_debug_info" = xyes],
 
 AC_SUBST([ENABLE_DEBUG_INFO_VAL])
 
-
-# Check for conflicting optional features user choices
-
-AS_IF([test "x$enable_python_bindings" = xno],
+# Check for conflicting Python related features user choices.
+AS_IF([test "x$enable_python_plugins" = xyes],
   [
-    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_python_bindings" = xunspecified],
+      [
+        # --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.
+        enable_python_bindings=yes
+      ],
+      [
+        AS_IF([test "x$enable_python_bindings" = xno],
+          [
+            # --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)
+          ]
+        )
+      ]
+    )
   ]
 )
 
+# Check for conflicting optional features user choices
+
 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.
@@ -540,7 +469,7 @@ AS_IF([test "x$enable_built_in_plugins" = xyes],
 
 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])])
+    AS_IF([test "x$enable_python_plugins" != xyes], [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)])
@@ -554,60 +483,75 @@ AS_IF([test "x$enable_python_bindings" = xyes],
   [AX_PKG_SWIG(2.0.0, [], [AC_MSG_ERROR([SWIG 2.0.0 or newer is required to build the python bindings])])]
 )
 
-AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes],
-  [
-  AM_PATH_PYTHON([3.0], [], [AC_MSG_ERROR(Python 3 is not available or is not the default Python interpreter on your system. See the README file to learn how to override your distribution's default Python interpreter.)])
-
+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_INCLUDE"], [
-    AS_IF([test -z "$PYTHON_CONFIG"], [
-      AC_PATH_PROGS([PYTHON_CONFIG],
-                    [python$PYTHON_VERSION-config python-config],
-                    [no],
-                    [`dirname $PYTHON`])
-      AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Is python-dev installed?])])
-    ])
-    AC_MSG_CHECKING([Python include flags])
-    PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
-    AC_MSG_RESULT([$PYTHON_INCLUDE])
+
+  AS_IF([test -z "$PYTHON_CONFIG"], [
+    AC_PATH_PROGS([PYTHON_CONFIG],
+                  [python$PYTHON_VERSION-config python-config],
+                  [],
+                  [`dirname $PYTHON`])
   ])
-  AS_IF([test -z "$PYTHON_LIBS"], [
-    AS_IF([test -z "$PYTHON_CONFIG"], [
-      AC_PATH_PROGS([PYTHON_CONFIG],
-                    [python$PYTHON_VERSION-config python-config],
-                    [no],
-                    [`dirname $PYTHON`])
-      AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Is python-dev installed?])])
+
+  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 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])
     ])
-    AC_MSG_CHECKING([Python library flags])
-    PYTHON_LIBS=`$PYTHON_CONFIG --libs`
-    AC_MSG_RESULT([$PYTHON_LIBS])
   ])
-  ]
-)
+], [:])
+
+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([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],
   [
     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$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"
+    AS_IF([test "x$enable_python_bindings" != xyes], [
+      AC_MSG_ERROR([The Python bindings are required to build their documentation])
+    ])
   ]
 )
+
+AS_IF([test "x$enable_debug_info" = xyes], [
+  # 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_ERROR([elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.])
+    ])
+])
 AC_SUBST([ELFUTILS_LIBS])
 
 AS_IF([test "x$enable_api_doc" = "xyes"],
@@ -622,7 +566,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])]
     )
@@ -678,17 +622,9 @@ AS_IF([test "x$exec_prefix" = xNONE], [
 
 AC_SUBST(LIBDIR)
 
-
-# Set global CFLAGS in AM_CFLAGS
-AM_CFLAGS="-Wall -Wformat -Werror=implicit-function-declaration $PTHREAD_CFLAGS $GLIB_CFLAGS"
-AC_SUBST(AM_CFLAGS)
-
-# Set global CPPFLAGS in AM_CPPFLAGS
-AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
-AC_SUBST(AM_CPPFLAGS)
-
-# Add glib to global link libs
-LIBS="$LIBS $GLIB_LIBS"
+# CFLAGS from libraries (the glib ones are needed for the following sizeof
+# test).
+AM_CFLAGS="${PTHREAD_CFLAGS} ${GLIB_CFLAGS}"
 
 # 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
@@ -696,6 +632,10 @@ LIBS="$LIBS $GLIB_LIBS"
 # glib.h is not platform specific but it includes glibconfig.h which is and
 # is usually installed in a non-standard path.
 
+# Do this before enabling all the warning flags, as the
+# AC_LANG_PROGRAM-generated program may generate some warning, which makes this
+# test fail unnecessarily.
+
 # Older versions of the pkg-config macros disallows PKG_* in the autoconf
 # output. Specifically allow pkg_config_libdir to be able to print the
 # error message.
@@ -719,14 +659,92 @@ target.
 ])
 CFLAGS=${save_CFLAGS}
 
+# Detect C and LD warning flags supported by the compiler.
+
+# Detect warning flags supported by the compiler, append them to WARN_CFLAGS.
+#
+# Pass -Werror as an extra flag during the test: this is needed to make the
+# -Wunknown-warning-option diagnostic fatal with clang.
+AX_APPEND_COMPILE_FLAGS([ 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
+       ],
+       [WARN_CFLAGS],
+       [-Werror])
+
+# When given, add -Werror to WARN_CFLAGS.
+AC_ARG_ENABLE([Werror],
+       [AS_HELP_STRING([--enable-Werror], [Treat compiler warnings as errors.])]
+)
+AS_IF([test "x$enable_Werror" = "xyes"],
+       [WARN_CFLAGS="${WARN_CFLAGS} -Werror"]
+)
+
+# 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 >= 4.0.
+WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition -Wstrict-prototypes"
+
+# CFLAGS from AX_APPEND_COMPILE_FLAGS.
+AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
+
+# Done for AM_CFLAGS.
+AC_SUBST(AM_CFLAGS)
+
+# Set global CPPFLAGS in AM_CPPFLAGS
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
+AC_SUBST(AM_CPPFLAGS)
+
+# Add glib to global link libs
+LIBS="$LIBS $GLIB_LIBS"
+
 # Abuse autoconf's AC_ARG_PROGRAM output variable 'program_transform_name'
 # to rename babeltrace2.bin to babeltrace2 at install time.
-program_transform_name="s&babeltrace2\.bin&babeltrace2&;s&babeltrace2-log\.bin&babeltrace2-log&;$program_transform_name"
+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
@@ -735,10 +753,12 @@ AC_CONFIG_FILES([
        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/__init__.py
+       src/bindings/python/bt2/bt2/version.py
        src/bindings/python/bt2/Makefile
        src/bindings/python/bt2/setup.py
        src/bindings/python/Makefile
@@ -756,6 +776,9 @@ AC_CONFIG_FILES([
        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
@@ -776,55 +799,31 @@ AC_CONFIG_FILES([
        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/utils/common.sh
-       tests/utils/diff.sh
+       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/cli/test_intersection], [chmod +x tests/cli/test_intersection])
-AC_CONFIG_FILES([tests/cli/test_convert_args], [chmod +x tests/cli/test_convert_args])
-AC_CONFIG_FILES([tests/cli/test_output_ctf_metadata], [chmod +x tests/cli/test_output_ctf_metadata])
-AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet_seq_num])
-AC_CONFIG_FILES([tests/cli/test_trace_copy], [chmod +x tests/cli/test_trace_copy])
-AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read])
-AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer])
-AC_CONFIG_FILES([tests/ctf-writer/test_ctf_writer], [chmod +x tests/ctf-writer/test_ctf_writer])
-AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugin_complete])
-AC_CONFIG_FILES([tests/lib/trace-ir/test_trace_ir], [chmod +x tests/lib/trace-ir/test_trace_ir])
-AC_CONFIG_FILES([tests/plugins/src.ctf.fs/query/test_query], [chmod +x tests/plugins/src.ctf.fs/query/test_query])
-AC_CONFIG_FILES([tests/plugins/src.ctf.fs/succeed/test_succeed], [chmod +x tests/plugins/src.ctf.fs/succeed/test_succeed])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu])
-AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu])
-
-AS_IF([test "x$enable_python_bindings" = xyes],
-  [
-       AC_CONFIG_FILES([tests/bindings/python/bt2/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2])
-       AC_CONFIG_FILES([tests/utils/test_python_bt2_env], [chmod +x tests/utils/test_python_bt2_env])
-  ]
-)
-
-AS_IF([test "x$enable_python_plugins" = "xyes"],
-  [AC_CONFIG_FILES([tests/python-plugin-provider/test_python_plugin_provider], [chmod +x tests/python-plugin-provider/test_python_plugin_provider])]
-  [AC_CONFIG_FILES([tests/python-plugin-provider/test_python_plugin_provider_env], [chmod +x tests/python-plugin-provider/test_python_plugin_provider_env])]
-)
-
 AC_OUTPUT
 
 #
@@ -836,9 +835,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.
@@ -857,29 +872,41 @@ PPRINT_PROP_STRING([Target architecture], $target_arch)
 
 AS_ECHO
 PPRINT_SUBTITLE([Python 3 language support])
+test "x$have_python" = "xyes" && value=1 || value=0
+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)
-AS_IF([test "x$enable_python_bindings" = "xyes" || test "x$enable_python_plugins" = "xyes"], [
+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])
+])
+AS_IF([test "x$have_python_dev" = "xyes"], [
+  PPRINT_PROP_STRING([python-config path], [$PYTHON_CONFIG])
   PPRINT_PROP_STRING([Python include paths], [$PYTHON_INCLUDE])
-  PPRINT_PROP_STRING([Python libraries], [$PYTHON_LIBS])
+  PPRINT_PROP_STRING([Python linker flags], [$PYTHON_LDFLAGS])
+])
+AS_IF([test "x$enable_python_bindings" = "xyes"], [
+  PPRINT_PROP_STRING([SWIG executable], [$SWIG])
+  PPRINT_PROP_STRING([SWIG library], [$SWIG_LIB])
 ])
 
 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])
@@ -900,15 +927,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])
@@ -916,17 +943,20 @@ 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`"
 report_sysconfdif="`eval eval echo $sysconfdir`"
+report_pluginsdir="`eval eval eval echo $BABELTRACE_PLUGINS_DIR`"
+report_pluginprovidersdir="`eval eval eval echo $BABELTRACE_PLUGIN_PROVIDERS_DIR`"
 
 # Print the bindir and libdir this `make install' will install into.
 AS_ECHO
 PPRINT_SUBTITLE([Install directories])
 PPRINT_PROP_STRING([Binaries], [$report_bindir])
 PPRINT_PROP_STRING([Libraries], [$report_libdir])
-PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace2/plugins])
+PPRINT_PROP_STRING([Plugins], [$report_pluginsdir])
+PPRINT_PROP_STRING([Plugin providers], [$report_pluginprovidersdir])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])
This page took 0.032593 seconds and 4 git commands to generate.