X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=7e22f2d377174d8fa4c6262d86c8a0c49d188969;hb=d8e292d43117c58804e19819eb06b5621f25246b;hp=33c5701b7e74f7e8dadb0bda8fefeb6898bb1121;hpb=0ede31e858584a3a33c2822bec1209e4d21da785;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 33c5701b..7e22f2d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,7 +262,6 @@ AC_CHECK_FUNCS([ \
 	dup2 \
 	ftruncate \
 	gethostbyname \
-	gethostname \
 	gettimeofday \
 	localtime_r \
 	memchr \
@@ -283,7 +282,6 @@ AC_CHECK_FUNCS([ \
 	strtoul \
 	strtoull \
 	tzset \
-	uname \
 ])
 
 # AC_FUNC_MALLOC causes problems when cross-compiling.
@@ -497,7 +495,7 @@ AS_IF([test "x$enable_built_in_python_plugin_support" = xyes],
 )
 
 
-# Check for conflicting optionnal features user choices
+# Check for conflicting optional features user choices
 
 AS_IF([test "x$enable_python_bindings" = xno],
   [
@@ -632,6 +630,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([
@@ -655,14 +658,11 @@ CFLAGS=${save_CFLAGS}
 program_transform_name="s&babeltrace\.bin&babeltrace&;s&babeltrace-log\.bin&babeltrace-log&;$program_transform_name"
 AC_SUBST(program_transform_name)
 
-
-	#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
+	bindings/python/Makefile
+	bindings/python/bt2/Makefile
+	bindings/python/bt2/__init__.py
 	common/Makefile
 	compat/Makefile
 	cli/Makefile
@@ -688,12 +688,14 @@ AC_CONFIG_FILES([
 	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/plugins/Makefile
+	tests/python-plugin-provider/Makefile
 	extras/Makefile
 	extras/valgrind/Makefile
 	plugins/Makefile
@@ -702,6 +704,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
@@ -728,17 +731,21 @@ AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet
 AC_CONFIG_FILES([tests/cli/test_trace_copy], [chmod +x tests/cli/test_trace_copy])
 AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read])
 AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer])
-AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin_info_complete])
 AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete])
-AC_CONFIG_FILES([tests/lib/test_dwarf_complete], [chmod +x tests/lib/test_dwarf_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/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2])]
+)
 
-AS_IF([test "x$enable_python" = xyes],
-  [AC_CONFIG_FILES([tests/bindings/python/bt2/testall.sh], [chmod +x tests/bindings/python/bt2/testall.sh])]
+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_OUTPUT