X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=323afa75e49b25c9c5995ac96d4007301ed0adda;hb=6ca0eb99012c3c6bbe3da1f45086368403fcac30;hp=016002d292b809bcc2dabb109e84d57c79bd8d63;hpb=251b463808cb2af57cb43ee8b0de381cf3f1e321;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 016002d2..323afa75 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.50]) 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_extra], [-pre1]) 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]) @@ -38,7 +38,7 @@ AC_PROG_CC_STDC # Checks for programs. AC_PROG_MAKE_SET -LT_INIT +LT_INIT(win32-dll) AC_PROG_YACC AC_PROG_LEX AC_PROG_MKDIR_P @@ -153,6 +153,7 @@ AC_CHECK_FUNCS([ \ MINGW32=no DEFAULT_ENABLE_DEBUG_INFO=yes +LT_NO_UNDEFINED="" AS_CASE([$host_os], [solaris*|darwin*], [ @@ -162,10 +163,12 @@ AS_CASE([$host_os], [ MINGW32=yes DEFAULT_ENABLE_DEBUG_INFO=no + LT_NO_UNDEFINED="-no-undefined" ] ) AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"]) +AC_SUBST(LT_NO_UNDEFINED) # Check for uuid in system libs AC_CHECK_FUNCS([uuid_generate], @@ -407,7 +410,7 @@ 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 "x$BABELTRACE_MINIMAL_LOG_LEVEL" = "x"], [BABELTRACE_MINIMAL_LOG_LEVEL=VERBOSE]) 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.]) ]) @@ -467,6 +470,11 @@ AS_IF([test "x$enable_api_doc" = "xyes"], [ DX_INIT_DOXYGEN([Babeltrace], [$(srcdir)/Doxyfile], [output]) ]) + #TODO: removed, work in progress + #bindings/python/Makefile + #bindings/python/babeltrace/Makefile + #bindings/python/bt2/Makefile + #bindings/python/bt2/__init__.py AC_CONFIG_FILES([ Makefile common/Makefile @@ -488,10 +496,6 @@ AC_CONFIG_FILES([ 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/cli/Makefile tests/cli/intersection/Makefile @@ -537,9 +541,13 @@ AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin 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/test_trace_copy], [chmod +x tests/cli/test_trace_copy]) AC_CONFIG_FILES([tests/cli/intersection/test_intersection], [chmod +x tests/cli/intersection/test_intersection]) +AC_CONFIG_FILES([tests/cli/test_convert_args], [chmod +x tests/cli/test_convert_args]) AC_CONFIG_FILES([tests/cli/intersection/bt_python_helper.py]) AC_CONFIG_FILES([tests/lib/writer/bt_python_helper.py]) +AC_CONFIG_FILES([tests/lib/writer/test_ctf_writer_empty_packet.py]) +AC_CONFIG_FILES([tests/lib/writer/test_ctf_writer_no_packet_context.py]) AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet_seq_num]) AS_IF([test "x$enable_python" = "xyes"], [