Fix: variable declaration shadows previously declared variable

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3dcc083d1517627cdd26f404068907e88e9a6511..3b03bc3a25df9567670170880b8ee7af3360ae93 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], [-pre1])
+m4_define([bt_version_extra], [-pre4])
 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/])
@@ -642,6 +642,9 @@ AC_SUBST(program_transform_name)
 AC_CONFIG_FILES([
        Makefile
        bindings/python/Makefile
+       bindings/python/babeltrace/Makefile
+       bindings/python/babeltrace/setup.py
+       bindings/python/babeltrace/babeltrace/__init__.py
        bindings/python/bt2/Makefile
        bindings/python/bt2/setup.py
        bindings/python/bt2/bt2/__init__.py
@@ -653,7 +656,7 @@ AC_CONFIG_FILES([
        doc/api/Doxyfile
        doc/bindings/Makefile
        doc/bindings/python/Makefile
-       doc/images/Makefile
+       doc/contributing-images/Makefile
        lib/Makefile
        lib/prio_heap/Makefile
        lib/plugin/Makefile
@@ -668,7 +671,6 @@ AC_CONFIG_FILES([
        tests/cli/Makefile
        tests/cli/intersection/Makefile
        tests/lib/Makefile
-       tests/lib/writer/Makefile
        tests/lib/test-plugin-plugins/Makefile
        tests/utils/common.sh
        tests/utils/Makefile
@@ -676,6 +678,7 @@ AC_CONFIG_FILES([
        tests/bindings/Makefile
        tests/bindings/python/Makefile
        tests/bindings/python/bt2/Makefile
+       tests/bindings/python/babeltrace/Makefile
        tests/plugins/Makefile
        tests/python-plugin-provider/Makefile
        extras/Makefile
@@ -705,7 +708,6 @@ AC_CONFIG_FILES([
        babeltrace-ctf.pc
 ])
 
-AC_CONFIG_FILES([tests/cli/intersection/bt_python_helper.py])
 AC_CONFIG_FILES([tests/cli/intersection/test_intersection], [chmod +x tests/cli/intersection/test_intersection])
 AC_CONFIG_FILES([tests/cli/test_convert_args], [chmod +x tests/cli/test_convert_args])
 AC_CONFIG_FILES([tests/cli/test_debug_info], [chmod +x tests/cli/test_debug_info])
@@ -715,19 +717,19 @@ AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read
 AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer])
 AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete])
 AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugin_complete])
-AC_CONFIG_FILES([tests/lib/writer/bt_python_helper.py])
-AC_CONFIG_FILES([tests/lib/writer/test_ctf_writer_empty_packet.py])
-AC_CONFIG_FILES([tests/lib/writer/test_ctf_writer_no_packet_context.py])
 AC_CONFIG_FILES([tests/plugins/test-utils-muxer-complete], [chmod +x tests/plugins/test-utils-muxer-complete])
 AC_CONFIG_FILES([tests/plugins/test_dwarf_complete], [chmod +x tests/plugins/test_dwarf_complete])
 AC_CONFIG_FILES([tests/plugins/test_bin_info_complete], [chmod +x tests/plugins/test_bin_info_complete])
 
 AS_IF([test "x$enable_python_bindings" = xyes],
-  [AC_CONFIG_FILES([tests/bindings/python/bt2/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2])]
+  [
+       AC_CONFIG_FILES([tests/bindings/python/bt2/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2])
+       AC_CONFIG_FILES([tests/bindings/python/babeltrace/test_python_babeltrace], [chmod +x tests/bindings/python/babeltrace/test_python_babeltrace])
+  ]
 )
 
 AS_IF([test "x$enable_python_plugins" = "xyes"],
-  [AC_CONFIG_FILES([tests/python-plugin-provider/test.sh], [chmod +x tests/python-plugin-provider/test.sh])]
+  [AC_CONFIG_FILES([tests/python-plugin-provider/test_python_plugin_provider], [chmod +x tests/python-plugin-provider/test_python_plugin_provider])]
 )
 
 AC_OUTPUT