X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=64bed0896521c6f5f0e0d7e7bdd0da8a06552469;hb=242ed509c52cafd91c445a4b6c97e91f48172b3b;hp=74993c1d42456d7930fd53407344e0ca883c2981;hpb=b14c7bf11ddef302870c4d1abf86d3a98f74cb08;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 74993c1d..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"], [
@@ -738,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
@@ -785,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