X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=ad89358d3f8f21f477038f73e750025e414815e6;hb=af18c5e73c167910ab252e130c6f8f167f986b42;hp=6625b58b7935cec2f6442e52100003b6bccfb630;hpb=5b5959d4547fa38c3ef1eeabaa5d176be060f6e2;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 6625b58b..ad89358d 100644 --- a/configure.ac +++ b/configure.ac @@ -497,7 +497,7 @@ AS_IF([test "x$enable_built_in_python_plugin_support" = xyes], ) -# Check for conflicting optionnal features user choices +# Check for conflicting optional features user choices AS_IF([test "x$enable_python_bindings" = xno], [ @@ -655,14 +655,11 @@ CFLAGS=${save_CFLAGS} program_transform_name="s&babeltrace\.bin&babeltrace&;s&babeltrace-log\.bin&babeltrace-log&;$program_transform_name" AC_SUBST(program_transform_name) - - #TODO: removed, work in progress - #bindings/python/Makefile - #bindings/python/babeltrace/Makefile - #bindings/python/bt2/Makefile - #bindings/python/bt2/__init__.py AC_CONFIG_FILES([ Makefile + bindings/python/Makefile + bindings/python/bt2/Makefile + bindings/python/bt2/__init__.py common/Makefile compat/Makefile cli/Makefile @@ -728,16 +725,16 @@ AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet AC_CONFIG_FILES([tests/cli/test_trace_copy], [chmod +x tests/cli/test_trace_copy]) 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_bin_info_complete], [chmod +x tests/lib/test_bin_info_complete]) AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete]) -AC_CONFIG_FILES([tests/lib/test_dwarf_complete], [chmod +x tests/lib/test_dwarf_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" = xyes], +AS_IF([test "x$enable_python_bindings_tests" = xyes], [AC_CONFIG_FILES([tests/bindings/python/bt2/testall.sh], [chmod +x tests/bindings/python/bt2/testall.sh])] )