X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=4e9ea09084ef2eb568ee12481eb34231a5196b8c;hp=9f4f27d1a025c502bbd740c7d6170ef9e280f077;hb=fdeaed2a55cb9d3f53125d55031959351a1bce09;hpb=b83c187d7075c9c8ebc2dbd98af6916a5c1c8dde diff --git a/configure.ac b/configure.ac index 9f4f27d1..4e9ea090 100644 --- a/configure.ac +++ b/configure.ac @@ -28,11 +28,13 @@ AC_PREREQ([2.50]) m4_define([bt_version_major], [2]) m4_define([bt_version_minor], [0]) -m4_define([bt_version_patch], [0]) -m4_define([bt_version_extra], [-rc1]) -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 @@ -41,6 +43,9 @@ m4_define([bt_lib_version_revision], [0]) m4_define([bt_lib_version_age], [0]) m4_define([bt_lib_version], bt_lib_version_current[:]bt_lib_version_revision[:]bt_lib_version_age) +bt_version_description="Amqui (/ɒmkwiː/) is a town in eastern Québec, Canada, at the base of the Gaspé peninsula in Bas-Saint-Laurent. Located at the confluence of the Humqui and Matapédia Rivers, its proximity to woodlands makes it a great destination for outdoor activities such as camping, hiking, and mountain biking." +bt_version_description_c_safe=$(echo $bt_version_description | $SED 's/"/\\"/g') + AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version) AC_CONFIG_HEADERS([src/common/config.h]) @@ -50,7 +55,9 @@ AC_CONFIG_MACRO_DIR([m4]) AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version]) AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version]) AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace patch version]) -AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace extra version]) +AC_DEFINE([BT_VERSION_DEV_STAGE], ["]bt_version_dev_stage["], [Babeltrace version development stage (can be empty)]) +AC_DEFINE([BT_VERSION_NAME], ["]bt_version_name["], [Babeltrace version name]) +AC_DEFINE_UNQUOTED([BT_VERSION_DESCRIPTION], ["$bt_version_description_c_safe"], [Babeltrace version description]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -192,6 +199,7 @@ LT_INIT([win32-dll]) AC_PROG_MAKE_SET AC_PROG_MKDIR_P AC_PROG_LN_S +AC_PATH_PROG([report_fold], [fold]) # set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file # is not distributed in tarballs @@ -355,23 +363,14 @@ AS_IF([test "x$BABELTRACE_DEBUG_MODE" = x1], [ 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 @@ -386,38 +385,34 @@ AC_ARG_ENABLE([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]) @@ -452,15 +447,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. @@ -471,7 +483,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)]) @@ -510,7 +522,10 @@ AM_PATH_PYTHON([3.0], [ 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]) ]) ]) @@ -528,15 +543,6 @@ AS_IF([test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" ]) ]) -AS_IF([test "x$enable_python_bindings_doc" = xyes], - [ - AM_CHECK_PYTHON_SPHINX([PYTHON]) - AS_IF([test "x$PYTHON_SPHINX_EXISTS" = xno], - [AC_MSG_ERROR([The Sphinx package for Python 3 is required to build the Python bindings documentation])] - ) - ] -) - AS_IF([test "x$enable_debug_info" = xyes], [ # Check if libelf and libdw are present @@ -560,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])] ) @@ -671,19 +677,21 @@ AX_COMPILER_FLAGS( -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-missing-include-dirs dnl - -Wno-duplicated-cond dnl -Wno-double-promotion dnl - -Wno-suggest-attribute=noreturn 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. @@ -719,10 +727,9 @@ 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 @@ -778,9 +785,9 @@ AC_CONFIG_FILES([ 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 @@ -809,9 +816,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. @@ -892,8 +915,6 @@ m4_popdef([build_man_pages_msg]) test "x$enable_api_doc" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([HTML API documentation], $value) -test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Python bindings documentation], $value) AS_ECHO PPRINT_SUBTITLE([Logging])