Use build tree plugins when executing from build tree

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 98237c5803964bbe4b85efb88a6e9046b2498dfd..0a257ba8af8ca9aed42a3f4420c2f297725bd7f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -429,6 +429,7 @@ AC_CONFIG_FILES([
        babeltrace-ctf.pc
 ])
 
+AC_CONFIG_FILES([converter/babeltrace.wrapper], [chmod +x converter/babeltrace.wrapper])
 AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_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])

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 4be27f987271b9a3128c303f4f0147c00e7dfd14..6abe05fac01b1478a80a27ff80235f1c8edc9f38 100644 (file)
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -48,3 +48,12 @@ if BABELTRACE_BUILD_WITH_MINGW
 babeltrace_log_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
 babeltrace_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
 endif
+
+check_SCRIPTS = babeltrace.wrapper
+
+all-local: $(PROGRAMS)
+       mv babeltrace babeltrace.libtool
+       cp babeltrace.wrapper babeltrace
+
+clean-local:
+       rm -f babeltrace.libtool

diff --git a/converter/babeltrace.wrapper.in b/converter/babeltrace.wrapper.in
new file mode 100755 (executable)
index 0000000..a32086d
--- /dev/null
+++ b/converter/babeltrace.wrapper.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+babeltrace --omit-system-plugin-path --omit-home-plugin-path \
+               --plugin-path "@abs_top_builddir@/plugins" ${*}