X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=3fa993dc59b2fba05161145640ef459bbd5025cb;hb=a347347e71de3c5dd2fcfce717e589797de9785c;hp=fafdd107002ceafc45617465caa51c38b3bd563f;hpb=d961a981a43446b1c0cf0d6905fa93ae131cc956;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index fafdd1070..3fa993dc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
-AC_INIT([lttng-tools],[2.6.0-rc3],[jeremie.galarneau@efficios.com],[],[http://lttng.org])
+AC_PREREQ([2.64])
+AC_INIT([lttng-tools],[2.6.0],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -414,6 +415,10 @@ if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then
 		AC_MSG_ERROR([[bison not found and is required when building from git.
 		Please install bison]])
 	fi
+	AC_PATH_PROG([BISON],[bison])
+	AX_PROG_BISON_VERSION([2.4], [],[
+		AC_MSG_ERROR([[Bison >= 2.4 is required when building from git]])
+	])
 fi
 
 if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then
@@ -421,6 +426,10 @@ if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then
 		AC_MSG_ERROR([[flex not found and is required when building from git.
 		Please install flex]])
 	fi
+	AC_PATH_PROG([FLEX],[flex])
+	AX_PROG_FLEX_VERSION([2.5.35], [],[
+		AC_MSG_ERROR([[Flex >= 2.5.35 is required when building from git]])
+	])
 fi
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"