X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=fa21a8813509bb698b18457bb28b27d24b127830;hb=6133c94191474e358f8c0688c8f9d3f5cc323836;hp=716c9f4da5fd3154a1bf518b9597a7ee1c9a8ef8;hpb=faf5c654855a7a42093e43c4c739bb69dd2375d3;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 716c9f4d..fa21a881 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,7 @@ AX_C___ATTRIBUTE__ AS_IF([test "x$ax_cv___attribute__" != "xyes"], [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])]) -# Make sur we have pthread support +# Make sure we have pthread support AX_PTHREAD([], [AC_MSG_ERROR([Could not configure pthread support])]) # Checks for typedefs, structures, and compiler characteristics. @@ -380,7 +380,7 @@ AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "TRACE" && \ 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]) +AC_DEFINE_UNQUOTED([BT_LOG_MINIMAL_LEVEL], [__BT_LOGGING_LEVEL_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level]) # BABELTRACE_DEV_MODE: AC_ARG_VAR([BABELTRACE_DEV_MODE], [Set to 1 to enable the Babeltrace developer mode (enables run-time checks for plugin developers)]) @@ -396,9 +396,9 @@ AS_IF([test "x$BABELTRACE_DEBUG_MODE" = x1], [ ], [BABELTRACE_DEBUG_MODE=0]) -## ## -## Optionnal features selection ## -## ## +## ## +## Optional features selection ## +## ## # Python bindings # Disabled by default @@ -606,7 +606,7 @@ AE_IF_FEATURE_ENABLED([api-doc], DX_XML_FEATURE(OFF) DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) - DX_INIT_DOXYGEN([Babeltrace 2], [$(builddir)/Doxyfile], [output]) + DX_INIT_DOXYGEN([babeltrace2], [$(builddir)/Doxyfile], [output]) AS_IF([test -z "$DX_DOXYGEN"], [AC_MSG_ERROR([You need doxygen to enable the API documentation])] ) @@ -746,7 +746,6 @@ m4_define([WARN_FLAGS_LIST], [ dnl -Wduplicated-branches dnl -Wlogical-op dnl -Wsuggest-override dnl - -Wno-unused-parameter dnl -Wno-sign-compare dnl dnl dnl Some versions of SWIG (like 3.0.12) generate code that produces @@ -761,7 +760,6 @@ m4_define([WARN_FLAGS_LIST], [ dnl dnl dnl Ref: https://github.com/swig/swig/issues/1259 -Wno-cast-function-type dnl - -Wno-missing-field-initializers dnl -Wno-maybe-uninitialized dnl ]) @@ -816,27 +814,14 @@ AC_CONFIG_FILES([ Makefile src/babeltrace2-ctf-writer.pc src/babeltrace2.pc - src/bindings/Makefile src/bindings/python/bt2/bt2/version.py src/bindings/python/bt2/Makefile src/bindings/python/bt2/setup.py - src/bindings/python/Makefile src/cli/Makefile - src/common/Makefile src/Makefile - src/plugins/common/Makefile - src/plugins/ctf/common/metadata/Makefile - src/plugins/ctf/Makefile - src/plugins/lttng-utils/Makefile - src/plugins/Makefile - src/plugins/text/Makefile - src/plugins/utils/Makefile tests/bitfield/Makefile tests/ctf-writer/Makefile tests/lib/Makefile - tests/lib/test-plugin-plugins/Makefile - tests/lib/conds/Makefile - tests/lib/utils/Makefile tests/Makefile tests/param-validation/Makefile tests/plugins/Makefile @@ -849,12 +834,11 @@ AC_CONFIG_FILES([ tests/plugins/flt.utils.muxer/succeed/Makefile tests/plugins/flt.utils.trimmer/Makefile tests/plugins/sink.text.pretty/Makefile + tests/utils/env.sh tests/utils/Makefile tests/utils/tap/Makefile ]) -AC_CONFIG_FILES([tests/utils/env.sh],[chmod +x tests/utils/env.sh]) - AC_OUTPUT #