X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=756b1fa64f9e676e7e4af1de5a90380b7ca10fe7;hp=2bf47831453467f5d835bad783a809d491834fa7;hb=aaa8b69881b8f66b2ddb910c1e4a8dd758efb511;hpb=03df65b73219609f0b41bec07080a5d055f35cff

diff --git a/configure.ac b/configure.ac
index 2bf47831..756b1fa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,10 @@ 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_extra], [-rc4])
 m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
+m4_define([bt_version_name], [])
+m4_define([bt_version_description], [])
 
 AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
 
@@ -51,6 +53,8 @@ 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_NAME], ["]bt_version_name["], [Babeltrace version name])
+AC_DEFINE([BT_VERSION_DESCRIPTION], ["]bt_version_description["], [Babeltrace version description])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -192,6 +196,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 +515,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 +568,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,14 +679,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-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.
@@ -714,8 +729,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
@@ -773,9 +789,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
@@ -804,9 +820,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.