X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b12fe3d2944755396fb86644f0a8d4a38728a1ec;hb=a8101b9166f96a7343965b6af219a848752869bd;hp=84fae3c356c7a628113b3eb9a5b48c0ca5564905;hpb=4f45f9bb59b86410a0f872899d1a66d6e1a520c8;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 84fae3c3..b12fe3d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,24 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[2.0.0-pre],[jeremie dot galarneau at efficios dot com])
+m4_define([bt_version_major], [2])
+m4_define([bt_version_minor], [0])
+m4_define([bt_version_patch], [0])
+m4_define([bt_version_extra], [-pre])
+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])
 
 # 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], [2:0:0])
+AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch)
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 
+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_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
@@ -358,6 +368,8 @@ AC_ARG_ENABLE([debug-info],
 	[AS_IF([test "x$enableval" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no])], [])
 
 AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$_enable_debug_info" = xyes])
+AC_DEFINE([BT_ENABLE_DEBUG_INFO], [1], [Enable debug info support])
+
 AS_IF([test "x$_enable_debug_info" = xyes], [
 	    # Check if libelf and libdw are present
 	    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
@@ -456,8 +468,8 @@ AC_CONFIG_FILES([
 	lib/Makefile
 	lib/prio_heap/Makefile
 	lib/plugin/Makefile
-        lib/component/Makefile
-	lib/component/notification/Makefile
+	lib/graph/Makefile
+	lib/graph/notification/Makefile
 	lib/ctf-ir/Makefile
 	lib/ctf-writer/Makefile
 	include/Makefile
@@ -467,8 +479,8 @@ AC_CONFIG_FILES([
 	bindings/python/bt2/Makefile
 	bindings/python/bt2/__init__.py
 	tests/Makefile
-	tests/bin/Makefile
-	tests/bin/intersection/Makefile
+	tests/cli/Makefile
+	tests/cli/intersection/Makefile
 	tests/lib/Makefile
 	tests/lib/writer/Makefile
 	tests/lib/test-plugin-plugins/Makefile
@@ -477,6 +489,7 @@ AC_CONFIG_FILES([
 	tests/bindings/Makefile
 	tests/bindings/python/Makefile
 	tests/bindings/python/bt2/Makefile
+	tests/plugins/Makefile
 	extras/Makefile
 	extras/valgrind/Makefile
 	plugins/Makefile
@@ -485,17 +498,18 @@ AC_CONFIG_FILES([
 	plugins/ctf/common/btr/Makefile
 	plugins/ctf/common/metadata/Makefile
 	plugins/ctf/common/notif-iter/Makefile
-	plugins/ctf/fs/Makefile
+	plugins/ctf/fs-src/Makefile
+	plugins/ctf/fs-sink/Makefile
 	plugins/ctf/lttng-live/Makefile
-	plugins/muxer/Makefile
 	plugins/text/Makefile
-	plugins/writer/Makefile
+	plugins/text/pretty/Makefile
 	plugins/utils/Makefile
 	plugins/utils/dummy/Makefile
 	plugins/utils/trimmer/Makefile
+	plugins/utils/muxer/Makefile
 	python-plugin-provider/Makefile
 	plugins/libctfcopytrace/Makefile
-	plugins/debug-info/Makefile
+	plugins/lttng-utils/Makefile
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])
@@ -508,11 +522,13 @@ AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_see
 AC_CONFIG_FILES([tests/lib/test_dwarf_complete], [chmod +x tests/lib/test_dwarf_complete])
 AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin_info_complete])
 
-AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read])
-AC_CONFIG_FILES([tests/bin/intersection/test_intersection], [chmod +x tests/bin/intersection/test_intersection])
-AC_CONFIG_FILES([tests/bin/intersection/bt_python_helper.py])
+AC_CONFIG_FILES([tests/plugins/test-utils-muxer-complete], [chmod +x tests/plugins/test-utils-muxer-complete])
+
+AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read])
+AC_CONFIG_FILES([tests/cli/intersection/test_intersection], [chmod +x tests/cli/intersection/test_intersection])
+AC_CONFIG_FILES([tests/cli/intersection/bt_python_helper.py])
 AC_CONFIG_FILES([tests/lib/writer/bt_python_helper.py])
-AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num])
+AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet_seq_num])
 
 AS_IF([test "x$enable_python" = "xyes"], [
 	AC_CONFIG_FILES(