X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=809abf3a4231ea335c963f6a26eea4ee600bf02e;hb=61bd6060a4d068612997fb0ea56193cde5ea6ac9;hp=cc23f5a421e539cca2b9d739fbaac22496661e07;hpb=abb7b782808d1737fc16727f9174fcff1bb0310d;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index cc23f5a4..809abf3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([babeltrace],[1.1.0],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[1.1.1],[mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -17,13 +17,26 @@ AC_CONFIG_HEADERS([config.h])
 AC_SYS_LARGEFILE
 
 # Checks for programs.
-AC_PROG_CC
+AC_PROG_CC_STDC
 AC_PROG_MAKE_SET
 LT_INIT
 AC_PROG_YACC
 AC_PROG_LEX
 
-AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) 
+if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
+        if test x"$YACC" != "xbison -y"; then
+                AC_MSG_ERROR([[bison not found and is required when building from git.
+                Please install bison]])
+        fi
+fi
+
+if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; then
+        if test x"$LEX" != "xflex"; then
+                AC_MSG_ERROR([[flex not found and is required when building from git.
+                Please install flex]])
+        fi
+fi
+
 
 AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
@@ -98,6 +111,7 @@ AC_CONFIG_FILES([
 	formats/ctf/types/Makefile
 	formats/ctf-text/Makefile
 	formats/ctf-text/types/Makefile
+	formats/ctf-metadata/Makefile
 	formats/bt-dummy/Makefile
 	formats/ctf/metadata/Makefile
 	converter/Makefile