X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=64bed0896521c6f5f0e0d7e7bdd0da8a06552469;hb=b0aa949375a6e0f8dfaab404ad7bd889da0ae99b;hp=f745ef2341d9e10669eaf06227151b962d6fd450;hpb=056632bfab2b876e4e6149eaa3a6889ca3d28533;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index f745ef23..64bed089 100644
--- 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"], [
@@ -340,6 +339,10 @@ AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
 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)])
 AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = x], [BABELTRACE_MINIMAL_LOG_LEVEL="DEBUG"])
@@ -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
@@ -781,6 +784,8 @@ PPRINT_PROP_BOOL([Python plugin support], $value)
 AS_IF([test "x$enable_python_bindings" = "xyes" || test "x$enable_python_plugins" = "xyes"], [
   PPRINT_PROP_STRING([Python include paths], [$PYTHON_INCLUDE])
   PPRINT_PROP_STRING([Python linker flags], [$PYTHON_LDFLAGS])
+  PPRINT_PROP_STRING([SWIG executable], [$SWIG])
+  PPRINT_PROP_STRING([SWIG library], [$SWIG_LIB])
 ])
 
 AS_ECHO
@@ -840,6 +845,7 @@ 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
@@ -847,4 +853,5 @@ PPRINT_SUBTITLE([Install directories])
 PPRINT_PROP_STRING([Binaries], [$report_bindir])
 PPRINT_PROP_STRING([Libraries], [$report_libdir])
 PPRINT_PROP_STRING([Plugins], [$report_pluginsdir])
+PPRINT_PROP_STRING([Plugin providers], [$report_pluginprovidersdir])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])