X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b22782608ead59cd955bd885c9b7f861fc085e9c;hb=ae7b8e0a1e942b656233be9c648a27f5cb9a585e;hp=7071100d3d35533f08550009a8d0f153b89f542f;hpb=fb4be38a72049287b4c0859c54a229ab6b0bba44;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 7071100d..b2278260 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], [-pre3]) 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 @@ -62,6 +62,7 @@ AC_HEADER_STDBOOL AC_CHECK_HEADERS([ \ fcntl.h \ float.h \ + ftw.h \ libintl.h \ limits.h \ malloc.h \ @@ -94,7 +95,7 @@ if test ! -f "$srcdir/plugins/ctf/common/metadata/lexer.c"; then fi -AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule) +AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule-no-export) # Check what libraries are required on this platform to link sockets programs. AX_LIB_SOCKET_NSL @@ -117,14 +118,11 @@ AC_TYPE_UINT8_T # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_FORK -AC_FUNC_MALLOC AC_FUNC_MKTIME AC_FUNC_MMAP -AC_FUNC_REALLOC AC_FUNC_STRERROR_R AC_CHECK_FUNCS([ \ atexit \ - dirfd \ dup2 \ ftruncate \ gethostbyname \ @@ -151,20 +149,33 @@ AC_CHECK_FUNCS([ \ uname \ ]) +# AC_FUNC_MALLOC causes problems when cross-compiling. +#AC_FUNC_MALLOC +#AC_FUNC_REALLOC + MINGW32=no DEFAULT_ENABLE_DEBUG_INFO=yes +LT_NO_UNDEFINED="" AS_CASE([$host_os], [solaris*|darwin*], [ DEFAULT_ENABLE_DEBUG_INFO=no ], + [cygwin*], + [ + DEFAULT_ENABLE_DEBUG_INFO=no + LT_NO_UNDEFINED="-no-undefined" + ], [mingw*], [ 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], @@ -230,13 +241,6 @@ AC_CHECK_LIB([c], [posix_fallocate], ] ) -# Check for faccessat -AC_CHECK_LIB([c], [faccessat], -[ - AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_FACCESSAT], 1, [Has faccessat support.]) -] -) - AC_CHECK_LIB([popt], [poptGetContext], [], [AC_MSG_ERROR([Cannot find popt.])] ) @@ -402,11 +406,11 @@ AS_IF([test "x$BUILT_IN_PYTHON_PLUGIN_SUPPORT" != x], [ ]) AM_CONDITIONAL([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$built_in_python_plugin_support" = "xyes"]) -PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0]) +PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-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.]) ]) @@ -437,7 +441,7 @@ AC_SUBST(babeltracepluginincludedir) babeltracegraphincludedir="${includedir}/babeltrace/graph" AC_SUBST(babeltracegraphincludedir) -program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name" +program_transform_name="s&babeltrace\.bin&babeltrace&;s&babeltrace-log\.bin&babeltrace-log&;$program_transform_name" AC_SUBST(program_transform_name) # check for Doxygen @@ -466,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 @@ -487,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 @@ -515,9 +520,11 @@ AC_CONFIG_FILES([ plugins/ctf/fs-sink/Makefile plugins/ctf/lttng-live/Makefile plugins/text/Makefile + plugins/text/dmesg/Makefile plugins/text/pretty/Makefile plugins/utils/Makefile plugins/utils/dummy/Makefile + plugins/utils/counter/Makefile plugins/utils/trimmer/Makefile plugins/utils/muxer/Makefile python-plugin-provider/Makefile @@ -536,9 +543,15 @@ 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/test_debug_info], [chmod +x tests/cli/test_debug_info]) +AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer]) 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"], [