m4_define([bt_version_major], [2])
m4_define([bt_version_minor], [0])
m4_define([bt_version_patch], [0])
-m4_define([bt_version_extra], [-pre3])
+m4_define([bt_version_extra], [-pre4])
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], [], [https://efficios.com/babeltrace/])
[enable_python_bindings_doc=no]
)
-# Python bindings tests
-# Disabled by default
-AC_ARG_ENABLE([python-bindings-tests],
- [AC_HELP_STRING([--enable-python-bindings-tests], [run the Python bindings tests])],
- [], dnl AC_ARG_ENABLE will fill enable_python_bindings_tests with the user choice
- [enable_python_bindings_tests=no]
-)
-
# Python plugins
# Disabled by default
AC_ARG_ENABLE([python-plugins],
# Set automake variables for optionnal feature conditionnals in Makefile.am
AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS], [test "x$enable_python_bindings" = xyes])
AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_DOC], [test "x$enable_python_bindings_doc" = xyes])
-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_TESTS], [test "x$enable_python_bindings_tests" = xyes])
AM_CONDITIONAL([ENABLE_PYTHON_PLUGINS], [test "x$enable_python_plugins" = xyes])
AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$enable_debug_info" = xyes])
AM_CONDITIONAL([ENABLE_API_DOC], [test "x$enable_api_doc" = xyes])
AS_IF([test "x$enable_python_bindings" = xno],
[
AS_IF([test "x$enable_python_bindings_doc" = xyes], [AC_MSG_ERROR([--enable-python-bindings-doc was specified without --enable-python-bindings])])
- AS_IF([test "x$enable_python_bindings_tests" = xyes], AC_MSG_ERROR([--enable-python-bindings-tests was specified without --enable-python-bindings]))
]
)
]
)
-AS_IF([test "x$enable_python_bindings_tests" = xyes],
- [
- AM_CHECK_PYTHON_TAPPY([PYTHON])
- AS_IF([test "x$PYTHON_TAPPY_EXISTS" = xno],
- [AC_MSG_ERROR([You need the tappy Python project to test the Python bindings (see <https://github.com/python-tap/tappy>)])]
- )
- ]
-)
-
AS_IF([test "x$enable_debug_info" = xyes],
[
# Check if libelf and libdw are present
# glib.h is not platform specific but it includes glibconfig.h which is and
# is usually installed in a non-standard path.
+# Older versions of the pkg-config macros disallows PKG_* in the autoconf
+# output. Specifically allow pkg_config_libdir to be able to print the
+# error message.
+m4_pattern_allow([PKG_CONFIG_LIBDIR])
+
save_CFLAGS=${CFLAGS}
CFLAGS="${CFLAGS} ${AM_CFLAGS}"
AC_COMPILE_IFELSE([
AC_CONFIG_FILES([
Makefile
bindings/python/Makefile
+ bindings/python/babeltrace/Makefile
+ bindings/python/babeltrace/setup.py
+ bindings/python/babeltrace/babeltrace/__init__.py
bindings/python/bt2/Makefile
- bindings/python/bt2/__init__.py
+ bindings/python/bt2/setup.py
+ bindings/python/bt2/bt2/__init__.py
common/Makefile
compat/Makefile
cli/Makefile
doc/api/Doxyfile
doc/bindings/Makefile
doc/bindings/python/Makefile
- doc/images/Makefile
+ doc/contributing-images/Makefile
lib/Makefile
lib/prio_heap/Makefile
lib/plugin/Makefile
tests/cli/Makefile
tests/cli/intersection/Makefile
tests/lib/Makefile
- tests/lib/writer/Makefile
tests/lib/test-plugin-plugins/Makefile
+ tests/utils/common.sh
tests/utils/Makefile
tests/utils/tap/Makefile
tests/bindings/Makefile
tests/bindings/python/Makefile
tests/bindings/python/bt2/Makefile
+ tests/bindings/python/babeltrace/Makefile
tests/plugins/Makefile
tests/python-plugin-provider/Makefile
extras/Makefile
plugins/ctf/common/btr/Makefile
plugins/ctf/common/metadata/Makefile
plugins/ctf/common/notif-iter/Makefile
+ plugins/ctf/common/utils/Makefile
plugins/ctf/fs-src/Makefile
plugins/ctf/fs-sink/Makefile
plugins/ctf/lttng-live/Makefile
babeltrace-ctf.pc
])
-AC_CONFIG_FILES([tests/cli/intersection/bt_python_helper.py])
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/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/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/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/plugins/test-utils-muxer-complete], [chmod +x tests/plugins/test-utils-muxer-complete])
AC_CONFIG_FILES([tests/plugins/test_dwarf_complete], [chmod +x tests/plugins/test_dwarf_complete])
AC_CONFIG_FILES([tests/plugins/test_bin_info_complete], [chmod +x tests/plugins/test_bin_info_complete])
-AS_IF([test "x$enable_python_bindings_tests" = xyes],
- [AC_CONFIG_FILES([tests/bindings/python/bt2/testall.sh], [chmod +x tests/bindings/python/bt2/testall.sh])]
+AS_IF([test "x$enable_python_bindings" = xyes],
+ [
+ AC_CONFIG_FILES([tests/bindings/python/bt2/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2])
+ AC_CONFIG_FILES([tests/bindings/python/babeltrace/test_python_babeltrace], [chmod +x tests/bindings/python/babeltrace/test_python_babeltrace])
+ ]
)
AS_IF([test "x$enable_python_plugins" = "xyes"],
- [AC_CONFIG_FILES([tests/python-plugin-provider/test.sh], [chmod +x tests/python-plugin-provider/test.sh])]
+ [AC_CONFIG_FILES([tests/python-plugin-provider/test_python_plugin_provider], [chmod +x tests/python-plugin-provider/test_python_plugin_provider])]
)
AC_OUTPUT
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`"