X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b6ba0fe2f834c5b274f15fbb5d0c176019d9f156;hb=ac04c35047386377a6606fdefe4b224cb52ece3e;hp=a9b2c6a970892d72415c1c5535445ba474e2209a;hpb=ce4064056e3579e27967340d42c2546df973fb1c;p=babeltrace.git diff --git a/configure.ac b/configure.ac index a9b2c6a9..b6ba0fe2 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*], [ @@ -161,10 +162,13 @@ AS_CASE([$host_os], [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], @@ -252,7 +256,7 @@ swig_version=2.0.0 AC_ARG_ENABLE([python-bindings], [AC_HELP_STRING([--enable-python-bindings], [generate Python bindings])], - [enable_python_bindings=yes], [enable_python_bindings=no]) + [enable_python_bindings=$enableval], [enable_python_bindings=no]) AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python_bindings:-yes}" = xyes]) @@ -262,7 +266,7 @@ AC_ARG_ENABLE( [--enable-python-plugins], [add support for the Babeltrace library and converter to load Python plugins]) ], - [enable_python_plugins=yes], + [enable_python_plugins=$enableval], [enable_python_plugins=no] ) @@ -274,7 +278,7 @@ else fi if test "x$enable_python_bindings" != xno || test "x$enable_python_plugins" != xno; then - AM_PATH_PYTHON([3.0], , [AC_MSG_ERROR(Python3 is not available or is not the default Python interpreter on your system. See the README file to learn how to override your distribution's default Python interpreter.)]) + AM_PATH_PYTHON([3.0], , [AC_MSG_ERROR(Python 3 is not available or is not the default Python interpreter on your system. See the README file to learn how to override your distribution's default Python interpreter.)]) AM_PATH_PYTHON_MODULES([PYTHON]) # pythondir is the path where extra modules are to be installed @@ -310,6 +314,8 @@ if test "x$enable_python_bindings" != xno || test "x$enable_python_plugins" != x ]) fi +AS_IF([test "x$BUILT_IN_PLUGINS" = ""]) + AM_CONDITIONAL([WITH_PYTHON_PLUGINS], [test "x$enable_python_plugins" != xno]) AS_IF( [test "x$enable_python_plugins" != xno], @@ -319,14 +325,14 @@ AS_IF( AC_ARG_ENABLE([python-bindings-doc], [AC_HELP_STRING([--enable-python-bindings-doc], [generate Python bindings documentation])], - [enable_python_bindings_doc=yes], [enable_python_bindings_doc=no]) + [enable_python_bindings_doc=$enableval], [enable_python_bindings_doc=no]) AM_CONDITIONAL([BUILD_PYTHON_BINDINGS_DOC], [test "x${enable_python_bindings_doc:-yes}" = xyes]) AC_ARG_ENABLE([python-bindings-tests], [AC_HELP_STRING([--enable-python-bindings-tests], [test Python bindings])], - [enable_python_bindings_tests=yes], [enable_python_bindings_tests=no]) + [enable_python_bindings_tests=$enableval], [enable_python_bindings_tests=no]) AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_TESTS], [test "x${enable_python_bindings_tests:-yes}" = xyes]) @@ -387,11 +393,14 @@ 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]) +AC_ARG_VAR([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [Statically-link Python plugin support into the babeltrace library]) 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)]) + AS_IF([test "x$enable_python_plugins" = "xno"], [ + AC_MSG_ERROR([You can't use BUILT_IN_PYTHON_PLUGIN_SUPPORT=1 without --enable-python-plugins.]) + ]) 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]) ]) @@ -401,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.]) ]) @@ -461,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 @@ -482,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 @@ -525,8 +535,6 @@ AC_CONFIG_FILES([ #AC_CONFIG_FILES([converter/babeltrace], [chmod +x converter/babeltrace]) AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete]) AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugin_complete]) -AC_CONFIG_FILES([tests/lib/test_seek_big_trace], [chmod +x tests/lib/test_seek_big_trace]) -AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_seek_empty_packet]) 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]) @@ -534,8 +542,11 @@ AC_CONFIG_FILES([tests/plugins/test-utils-muxer-complete], [chmod +x tests/plugi 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/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"], [ @@ -559,7 +570,7 @@ AS_ECHO AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION$PPRINT_COLOR_RST") AS_ECHO -PPRINT_SUBTITLE([Features]) +PPRINT_SUBTITLE([System]) # Target architecture we're building for. target_arch=$host_cpu @@ -572,48 +583,59 @@ for f in $CFLAGS; do fi done ] -PPRINT_PROP_STRING([Target architecture], $target_arch) -# Minimal log level -PPRINT_PROP_STRING([Minimal log level], $BABELTRACE_MINIMAL_LOG_LEVEL) - -# API doc -test "x$enable_api_doc" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([HTML API documentation], $value) +PPRINT_PROP_STRING([Target architecture], $target_arch) -# python bindings enabled/disabled +AS_ECHO +PPRINT_SUBTITLE([Python 3 language support]) test "x$enable_python_bindings" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python bindings], $value) - -# python bindings doc enabled/disabled -test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Python bindings doc], $value) - -# python bindings tests enabled/disabled -test "x$enable_python_bindings_tests" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Python bindings tests], $value) - -# python plugins enabled/disabled test "x$enable_python_plugins" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python plugin support], $value) +AS_IF([test "x$enable_python_bindings" = "xyes" || test "x$enable_python_plugins" = "xyes"], [ + PPRINT_PROP_STRING([Python include paths], [$PYTHON_INCLUDE]) + PPRINT_PROP_STRING([Python libraries], [$PYTHON_LIBS]) +]) -# built-in Python plugin support enabled/disabled +AS_ECHO +PPRINT_SUBTITLE([Plugins]) +PPRINT_PROP_BOOL(['ctf' plugin], 1) +test "x$_enable_debug_info" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL(['lttng-utils' plugin], $value) +PPRINT_PROP_BOOL(['text' plugin], 1) +PPRINT_PROP_BOOL(['utils' plugin], 1) + +AS_ECHO +PPRINT_SUBTITLE([Built-in features]) +test "x$built_in_plugins" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Built-in plugins], $value) 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) +AS_ECHO +PPRINT_SUBTITLE([Documentation]) +test "x$enable_api_doc" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([HTML API documentation], $value) +test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Python bindings documentation], $value) -# built-in plug-ins enabled/disabled -test "x$built_in_plugins" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Built-in plug-ins], $value) +AS_ECHO +PPRINT_SUBTITLE([Logging]) +PPRINT_PROP_STRING([Minimal log level], $BABELTRACE_MINIMAL_LOG_LEVEL) + +AS_ECHO +PPRINT_SUBTITLE([Testing]) +test "x$enable_python_bindings_tests" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Python bindings tests], $value) report_bindir="`eval eval echo $bindir`" report_libdir="`eval eval echo $libdir`" +report_sysconfdif="`eval eval echo $sysconfdir`" # Print the bindir and libdir this `make install' will install into. AS_ECHO PPRINT_SUBTITLE([Install directories]) PPRINT_PROP_STRING([Binaries], [$report_bindir]) PPRINT_PROP_STRING([Libraries], [$report_libdir]) +PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace/plugins]) +PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])