Sync argpar with upstream

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 12e15b6cfadeafb8715414f94ffe0621d734d2c0..b1edd9ee85421c43e40774f01590bdbcf17747e6 100644 (file)
--- 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/])
@@ -671,13 +671,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-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.
@@ -772,9 +780,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