m4_define([bt_version_major], [2])
m4_define([bt_version_minor], [0])
-m4_define([bt_version_patch], [0])
-m4_define([bt_version_extra], [-pre5])
-m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
+m4_define([bt_version_patch], [3])
+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
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])
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
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]
-)
-
-# 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]
+ [enable_python_bindings=unspecified]
)
# 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]
+ [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
)
# Debug info
# 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]
+ [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]
+ [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
)
# 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]
+ [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
)
# 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]
)
# 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])
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.
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)])
AS_IF([test -z "$PYTHON_LDFLAGS"], [
AC_MSG_CHECKING([Python library flags])
- PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+ # 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])
])
])
])
])
-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(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
# 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.
])
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-double-promotion dnl
+ -Wno-cast-align 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
+ ])
+
+# 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.
+#
+# 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.
+
+AM_CFLAGS="${AM_CFLAGS} -Wold-style-definition"
+
+# We want this one to always be an error.
+AM_CFLAGS="${AM_CFLAGS} -Werror=implicit-function-declaration"
+
+# 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&;$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/api/libbabeltrace2/Doxyfile
+ doc/api/libbabeltrace2/Makefile
doc/contributing-images/Makefile
doc/Makefile
doc/man/asciidoc-attrs.conf
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/argpar/Makefile
tests/lib/Makefile
tests/lib/test-plugin-plugins/Makefile
tests/Makefile
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])
projects / babeltrace.git / blobdiff