Remove everything related to the `bt2.ctf_writer` Python module

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 20f0345682ae8d3cd03a27c2f84af2c2c596bad9..51c2ab59803c44f4406a0a503919407ebd9fc945 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,17 +36,22 @@ AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch)
+m4_define([bt_lib_version_current], [0])
+m4_define([bt_lib_version_revision], [0])
+m4_define([bt_lib_version_age], [0])
+m4_define([bt_lib_version], bt_lib_version_current[:]bt_lib_version_revision[:]bt_lib_version_age)
+
+AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
-AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace library major version])
-AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace library minor version])
-AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace library patch version])
-AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace library extra version])
+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_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -377,8 +382,8 @@ AC_ARG_VAR([PYTHON_LIBS], [Library flags for Python, bypassing python-config])
 AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
 
 # PLUGINSDIR: Plugins directory
-AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace/plugins]])
-AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace/plugins'])
+AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
+AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins'])
 
 # BABELTRACE_MINIMAL_LOG_LEVEL:
 AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (VERBOSE, DEBUG, INFO, WARN, ERROR (default), FATAL, or NONE)])
@@ -778,8 +783,8 @@ AC_CONFIG_FILES([
        python-plugin-provider/Makefile
        plugins/lttng-utils/Makefile
        plugins/lttng-utils/debug-info/Makefile
-       babeltrace.pc
-       babeltrace-ctf.pc
+       babeltrace2.pc
+       babeltrace2-ctf.pc
 ])
 
 AC_CONFIG_FILES([tests/cli/test_intersection], [chmod +x tests/cli/test_intersection])
@@ -792,7 +797,6 @@ 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/trace-ir/test_trace_ir], [chmod +x tests/lib/trace-ir/test_trace_ir])
-AC_CONFIG_FILES([tests/lib/ctf-writer/test_ctf_writer], [chmod +x tests/lib/ctf-writer/test_ctf_writer])
 AC_CONFIG_FILES([tests/plugins/ctf/test_ctf_plugin], [chmod +x tests/plugins/ctf/test_ctf_plugin])
 AC_CONFIG_FILES([tests/plugins/test_utils_muxer_complete], [chmod +x tests/plugins/test_utils_muxer_complete])
 AC_CONFIG_FILES([tests/plugins/test_lttng_utils_debug_info], [chmod +x tests/plugins/test_lttng_utils_debug_info])
@@ -809,7 +813,6 @@ 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/utils/test_python_bt2_env], [chmod +x tests/utils/test_python_bt2_env])
-       AC_CONFIG_FILES([tests/bindings/python/babeltrace/test_python_babeltrace], [chmod +x tests/bindings/python/babeltrace/test_python_babeltrace])
   ]
 )
 
@@ -921,5 +924,5 @@ AS_ECHO
 PPRINT_SUBTITLE([Install directories])
 PPRINT_PROP_STRING([Binaries], [$report_bindir])
 PPRINT_PROP_STRING([Libraries], [$report_libdir])
-PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace/plugins])
+PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace2/plugins])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])