X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=eb72e613c63360c5dab5aa0eceeb36ba91e29131;hb=b7cbc7991dbe94cebca2b9319da0e87af6006efb;hp=3bbc0c7fac52198666c6a52fc10f4c029dd0d726;hpb=abdabab538802dcd8b805b71d7230336f2140822;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 3bbc0c7f..eb72e613 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,16 +386,12 @@ AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2
 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 (TRACE, DEBUG (default), INFO, WARN, ERROR, FATAL, or NONE)])
+AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), or INFO)])
 AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = x], [BABELTRACE_MINIMAL_LOG_LEVEL="DEBUG"])
 AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "TRACE" && \
        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 TRACE, DEBUG, INFO, WARN, ERROR, FATAL, or NONE.])]
+       test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO"],
+  [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use TRACE, DEBUG, or INFO.])]
 )
 AC_DEFINE_UNQUOTED([BT_MINIMAL_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level])
 
@@ -490,7 +486,7 @@ AM_CONDITIONAL([ENABLE_API_DOC], [test "x$enable_api_doc" = xyes])
 AM_CONDITIONAL([ENABLE_BUILT_IN_PLUGINS], [test "x$enable_built_in_plugins" = xyes])
 AM_CONDITIONAL([ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$enable_built_in_python_plugin_support" = xyes])
 AM_CONDITIONAL([ENABLE_MAN_PAGES], [test "x$enable_man_pages" = xyes])
-
+AM_CONDITIONAL([HAVE_PYTHON], [test "x$enable_python_bindings" = xyes || test "x$enable_python_plugins" = xyes])
 
 # Set defines for optionnal features conditionnals in the source code
 
@@ -773,6 +769,7 @@ AC_CONFIG_FILES([
 	src/plugins/utils/Makefile
 	src/plugins/utils/muxer/Makefile
 	src/plugins/utils/trimmer/Makefile
+	src/py-common/Makefile
 	src/python-plugin-provider/Makefile
 	tests/ctf-writer/Makefile
 	tests/lib/Makefile
@@ -781,7 +778,10 @@ AC_CONFIG_FILES([
 	tests/plugins/Makefile
 	tests/plugins/src.ctf.fs/Makefile
 	tests/plugins/src.ctf.fs/succeed/Makefile
+  tests/plugins/sink.ctf.fs/Makefile
+  tests/plugins/sink.ctf.fs/succeed/Makefile
 	tests/plugins/flt.lttng-utils.debug-info/Makefile
+	tests/plugins/flt.utils.trimmer/Makefile
 	tests/utils/Makefile
 	tests/utils/tap/Makefile
 ])