X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b31f7acc16e628972d735dda7f517f3e9d3b80b3;hb=d85ef162f9130fe7c11564f685d1542bc4782036;hp=753a7778b4582847de56bc8ab2e3273a226697d1;hpb=3228cc1db0ba3ff2b9007de3872fe61b66502493;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 753a7778..b31f7acc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,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.)])
@@ -398,6 +400,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)
@@ -471,14 +481,15 @@ AC_CONFIG_FILES([
 	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
@@ -487,6 +498,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
@@ -495,18 +507,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/text/pretty/Makefile
-	plugins/writer/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
 ])
@@ -519,11 +531,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(
@@ -561,6 +575,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)