X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=a9b2c6a970892d72415c1c5535445ba474e2209a;hb=4cbd174e53b3912f1ff65e86e6a2df09c211aad0;hp=84fae3c356c7a628113b3eb9a5b48c0ca5564905;hpb=4f45f9bb59b86410a0f872899d1a66d6e1a520c8;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 84fae3c3..a9b2c6a9 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,12 +368,13 @@ 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]) + 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.)]) - AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) - BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) - AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature]) + # 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.)]) + AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) + BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) + AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature]) ], []) AC_ARG_VAR([BUILT_IN_PLUGINS], [Statically-link in-tree plug-ins into the babeltrace binary]) @@ -388,6 +399,14 @@ AM_CONDITIONAL([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$built_in_python_plugin PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0]) +# Logging +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)]) +AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = "x"], [BABELTRACE_MINIMAL_LOG_LEVEL=DEBUG]) +AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "VERBOSE" && test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "DEBUG" && test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO" && test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "WARN" && test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "ERROR" && test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "FATAL" && test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "NONE"], [ + AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use VERBOSE, DEBUG, INFO, WARN, ERROR, FATAL, or NONE.]) +]) +AC_DEFINE_UNQUOTED([BT_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level]) + LIBS="$LIBS $GMODULE_LIBS" PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat" AC_SUBST(PACKAGE_CFLAGS) @@ -456,19 +475,20 @@ 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 + logging/Makefile bindings/Makefile bindings/python/Makefile bindings/python/babeltrace/Makefile 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 +497,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 +506,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 +530,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( @@ -550,6 +574,9 @@ done ] PPRINT_PROP_STRING([Target architecture], $target_arch) +# Minimal log level +PPRINT_PROP_STRING([Minimal log level], $BABELTRACE_MINIMAL_LOG_LEVEL) + # API doc test "x$enable_api_doc" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([HTML API documentation], $value)