X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b12fe3d2944755396fb86644f0a8d4a38728a1ec;hb=a8101b9166f96a7343965b6af219a848752869bd;hp=de5553b94a141f86e6504082b5ab82874fdc552d;hpb=1670bffdf312795f277237062cca264967f13fd0;p=babeltrace.git diff --git a/configure.ac b/configure.ac index de5553b9..b12fe3d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,24 @@ AC_PREREQ([2.50]) -AC_INIT([babeltrace],[2.0.0-pre],[jeremie dot galarneau at efficios dot com]) +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], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra) +AC_INIT([babeltrace],bt_version,[jeremie dot galarneau at efficios dot com]) # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -AC_SUBST([BABELTRACE_LIBRARY_VERSION], [2:0:0]) +AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) +AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace library major version]) +AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace library minor version]) +AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace library patch version]) +AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace library extra version]) + AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -61,7 +71,7 @@ AC_CHECK_HEADERS([ \ sys/socket.h \ ]) -if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then +if test ! -f "$srcdir/plugins/ctf/common/metadata/parser.h"; then if test x"$(basename "$YACC")" != "xbison -y"; then AC_MSG_ERROR([[bison not found and is required when building from git. Please install bison]]) @@ -72,7 +82,7 @@ if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then ]) fi -if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; then +if test ! -f "$srcdir/plugins/ctf/common/metadata/lexer.c"; then if test x"$LEX" != "xflex"; then AC_MSG_ERROR([[flex not found and is required when building from git. Please install flex]]) @@ -358,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.)]) @@ -376,6 +388,16 @@ AS_IF([test "x$BUILT_IN_PLUGINS" != x], [ ]) AM_CONDITIONAL([BUILT_IN_PLUGINS], [test "x$built_in_plugins" = "xyes"]) +AC_ARG_VAR([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [Statically-link Python plugin support into the babeltrace binary]) +AS_IF([test "x$BUILT_IN_PYTHON_PLUGIN_SUPPORT" != x], [ +# Built-in plug-ins are only available when the --disable-shared --enable-static options are used. + AS_IF([test "x$enable_static" != "xyes"], [AC_MSG_ERROR(--enable-static must be used to bundle Python plugin support in the babeltrace executable)]) + AS_IF([test "x$enable_shared" = "xyes"], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace executable)]) + built_in_python_plugin_support=yes + AC_DEFINE([BT_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [1], [Define to 1 to register plug-in attributes in static executable sections]) +]) +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]) LIBS="$LIBS $GMODULE_LIBS" @@ -388,23 +410,20 @@ AC_SUBST(DEFAULT_INCLUDES) babeltraceincludedir="${includedir}/babeltrace" AC_SUBST(babeltraceincludedir) -babeltracectfincludedir="${includedir}/babeltrace/ctf" -AC_SUBST(babeltracectfincludedir) - babeltracectfwriterincludedir="${includedir}/babeltrace/ctf-writer" AC_SUBST(babeltracectfwriterincludedir) +babeltracectfincludedir="${includedir}/babeltrace/ctf" +AC_SUBST(babeltracectfincludedir) + babeltracectfirincludedir="${includedir}/babeltrace/ctf-ir" AC_SUBST(babeltracectfirincludedir) babeltracepluginincludedir="${includedir}/babeltrace/plugin" AC_SUBST(babeltracepluginincludedir) -babeltracecomponentincludedir="${includedir}/babeltrace/component" -AC_SUBST(babeltracecomponentincludedir) - -babeltracecomponentnotifincludedir="${includedir}/babeltrace/component/notification" -AC_SUBST(babeltracecomponentnotifincludedir) +babeltracegraphincludedir="${includedir}/babeltrace/graph" +AC_SUBST(babeltracegraphincludedir) program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name" AC_SUBST(program_transform_name) @@ -437,32 +456,22 @@ AS_IF([test "x$enable_api_doc" = "xyes"], [ AC_CONFIG_FILES([ Makefile - types/Makefile common/Makefile compat/Makefile - formats/Makefile - formats/ctf/Makefile - formats/ctf/types/Makefile - formats/ctf-text/Makefile - formats/ctf-text/types/Makefile - formats/ctf-metadata/Makefile - formats/bt-dummy/Makefile - formats/lttng-live/Makefile - formats/ctf/metadata/Makefile - formats/ctf/writer/Makefile - formats/ctf/ir/Makefile - converter/Makefile + cli/Makefile doc/Makefile - doc/api/Makefile - doc/api/Doxyfile + doc/api/Makefile + doc/api/Doxyfile doc/bindings/Makefile doc/bindings/python/Makefile doc/images/Makefile lib/Makefile lib/prio_heap/Makefile lib/plugin/Makefile - lib/component/Makefile - lib/component/notification/Makefile + lib/graph/Makefile + lib/graph/notification/Makefile + lib/ctf-ir/Makefile + lib/ctf-writer/Makefile include/Makefile bindings/Makefile bindings/python/Makefile @@ -470,8 +479,8 @@ AC_CONFIG_FILES([ 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 @@ -480,6 +489,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 @@ -488,12 +498,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/trimmer/Makefile - plugins/writer/Makefile + plugins/text/pretty/Makefile + plugins/utils/Makefile + plugins/utils/dummy/Makefile + plugins/utils/trimmer/Makefile + plugins/utils/muxer/Makefile + python-plugin-provider/Makefile + plugins/libctfcopytrace/Makefile + plugins/lttng-utils/Makefile babeltrace.pc babeltrace-ctf.pc ]) @@ -506,12 +522,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/bin/test_formats], [chmod +x tests/bin/test_formats]) +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( @@ -569,6 +586,10 @@ PPRINT_PROP_BOOL([Python bindings tests], $value) test "x$enable_python_plugins" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python plugin support], $value) +# built-in Python plugin support enabled/disabled +test "x$built_in_python_plugin_support" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Built-in Python plugin support], $value) + # debug info enabled/disabled test "x$_enable_debug_info" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Debug information output], $value)