X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=ca0c0626ccb92b831f69cc779c3fdbef8d98c523;hb=80d037bccf5043d23bfc09e1f45a5198929f0411;hp=d15957d665808de365ebab4c5e1b24de0582cfee;hpb=de3fb4cda5aa1f33588e01e8d09ffdc01977273f;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index d15957d6..ca0c0626 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,14 +415,6 @@ AC_ARG_ENABLE([python-bindings-doc],
   [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],
@@ -467,7 +459,6 @@ AC_ARG_ENABLE([built-in-python-plugin-support],
 # 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])
@@ -500,7 +491,6 @@ AS_IF([test "x$enable_built_in_python_plugin_support" = 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]))
   ]
 )
 
@@ -573,15 +563,6 @@ AS_IF([test "x$enable_python_bindings_doc" = xyes],
   ]
 )
 
-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
@@ -630,6 +611,11 @@ LIBS="$LIBS $GLIB_LIBS"
 # 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([
@@ -657,7 +643,8 @@ AC_CONFIG_FILES([
 	Makefile
 	bindings/python/Makefile
 	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
@@ -666,7 +653,7 @@ AC_CONFIG_FILES([
 	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
@@ -699,6 +686,7 @@ AC_CONFIG_FILES([
 	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
@@ -734,12 +722,12 @@ AC_CONFIG_FILES([tests/plugins/test-utils-muxer-complete], [chmod +x tests/plugi
 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],
+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])]
 )
 
 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
@@ -809,11 +797,6 @@ 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`"