X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=fd33bd064045f5669ab08cad8fc8e2af450b5b7d;hb=af597f37371c47fb3ce4e605d9675b53dca6daf1;hp=b791d005f32a4edb6ec9269694303a99ee18d468;hpb=02bb4fcc399072b657877925489f4b4e43754a57;p=babeltrace.git diff --git a/configure.ac b/configure.ac index b791d005..fd33bd06 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,12 @@ 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], [-pre6]) -m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra) +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_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 @@ -510,7 +518,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]) ]) ]) @@ -560,7 +571,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,20 +682,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 - -Wno-strict-prototypes 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. @@ -720,8 +732,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/api/libbabeltrace2/Doxyfile + doc/api/libbabeltrace2/Makefile doc/bindings/Makefile doc/bindings/python/Makefile doc/contributing-images/Makefile @@ -779,9 +792,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 @@ -810,9 +823,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.