From b545080b70920391f818116b481884d0260a313d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 16 Dec 2016 09:20:05 +0100 Subject: [PATCH] Use build tree plugins when executing from build tree MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- configure.ac | 1 + converter/Makefile.am | 9 +++++++++ converter/babeltrace.wrapper.in | 4 ++++ 3 files changed, 14 insertions(+) create mode 100755 converter/babeltrace.wrapper.in diff --git a/configure.ac b/configure.ac index 98237c58..0a257ba8 100644 --- 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 4be27f98..6abe05fa 100644 --- 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 index 00000000..a32086d6 --- /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" ${*} -- 2.34.1