cli: move plugin loading code to its own file

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d224371a7f71c9769d47cbe8fdd77ed14a69e4c..34c0c4b0df7f95e63c27cd0b9fd5eb1032fe1993 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
 AC_CONFIG_HEADERS([src/common/config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
 AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version])
 AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version])
@@ -201,7 +200,7 @@ AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"])
 
 # check for bison
 AC_PROG_YACC
-AX_PROG_BISON_VERSION([2.4], [have_bison=yes])
+AX_PROG_BISON_VERSION([2.5], [have_bison=yes])
 
 AS_IF([test "x$have_bison" != "xyes"], [
   AS_IF([test "x$in_git_repo" = "xyes"], [
@@ -336,9 +335,13 @@ AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for Python, bypassing python-config]
 AC_ARG_VAR([PYTHON_LDFLAGS], [Linker flags for Python, bypassing python-config])
 AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
 
-# PLUGINSDIR: Plugins directory
-AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
-AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins'])
+# BABELTRACE_PLUGINS_DIR: Plugins directory
+AC_ARG_VAR([BABELTRACE_PLUGINS_DIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]])
+AS_IF([test "x$BABELTRACE_PLUGINS_DIR" = x], [BABELTRACE_PLUGINS_DIR='${libdir}/babeltrace2/plugins'])
+
+# BABELTRACE_PLUGIN_PROVIDERS_DIR: Plugin providers directory
+AC_ARG_VAR([BABELTRACE_PLUGIN_PROVIDERS_DIR], [built-in plugin providers install directory [LIBDIR/babeltrace2/plugin-providers]])
+AS_IF([test "x$BABELTRACE_PLUGIN_PROVIDERS_DIR" = x], [BABELTRACE_PLUGIN_PROVIDERS_DIR='${libdir}/babeltrace2/plugin-providers'])
 
 # BABELTRACE_MINIMAL_LOG_LEVEL:
 AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), or INFO)])
@@ -734,8 +737,8 @@ AC_CONFIG_FILES([
        tests/plugins/Makefile
        tests/plugins/src.ctf.fs/Makefile
        tests/plugins/src.ctf.fs/succeed/Makefile
-  tests/plugins/sink.ctf.fs/Makefile
-  tests/plugins/sink.ctf.fs/succeed/Makefile
+       tests/plugins/sink.ctf.fs/Makefile
+       tests/plugins/sink.ctf.fs/succeed/Makefile
        tests/plugins/flt.lttng-utils.debug-info/Makefile
        tests/plugins/flt.utils.trimmer/Makefile
        tests/utils/Makefile
@@ -839,11 +842,14 @@ PPRINT_PROP_BOOL([Developer mode], $BABELTRACE_DEV_MODE)
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"
 report_sysconfdif="`eval eval echo $sysconfdir`"
+report_pluginsdir="`eval eval eval echo $BABELTRACE_PLUGINS_DIR`"
+report_pluginprovidersdir="`eval eval eval echo $BABELTRACE_PLUGIN_PROVIDERS_DIR`"
 
 # Print the bindir and libdir this `make install' will install into.
 AS_ECHO
 PPRINT_SUBTITLE([Install directories])
 PPRINT_PROP_STRING([Binaries], [$report_bindir])
 PPRINT_PROP_STRING([Libraries], [$report_libdir])
-PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace2/plugins])
+PPRINT_PROP_STRING([Plugins], [$report_pluginsdir])
+PPRINT_PROP_STRING([Plugin providers], [$report_pluginprovidersdir])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])