X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=6bbedb0361c0ba86fdfd399a817e06fb0a1a9cad;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=35e50c8a2439ad3f6b83731aadd850f5975295c6;hpb=cd1322b2fbdb80a7dccc6b4e82c4ed7c2620fde4;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 35e50c8a..6bbedb03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ 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)
 
 AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
@@ -510,7 +510,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 +563,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,18 +674,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-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.
@@ -718,8 +724,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
@@ -777,9 +784,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