X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=fdefe2af1061148ef85c0def5de4b7fe64e84483;hb=74cbc033ace9e6a9ae2628af43c8c237fa66928f;hp=8a636075a756813a29b8ef88ed93dbc75574de63;hpb=5881989879e8bc9819c14c4ea8bd05b4d159be58;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 8a636075..fdefe2af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,20 @@ 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)
 
@@ -60,7 +73,10 @@ AC_CHECK_LIB([uuid], [uuid_generate],
 		have_libc_uuid=yes
 	],
 	[
-		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+		# for MinGW32 we have our own internal implemenation of uuid using Windows functions.
+		if test "x$MINGW32" = xno; then
+			AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+		fi
 	])
 ]
 )
@@ -102,6 +118,7 @@ AC_SUBST(babeltracectfincludedir)
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
+	compat/Makefile
 	formats/Makefile
 	formats/ctf/Makefile
 	formats/ctf/types/Makefile
@@ -120,5 +137,6 @@ AC_CONFIG_FILES([
 	extras/Makefile
 	extras/valgrind/Makefile
 	babeltrace.pc
+	babeltrace-ctf.pc
 ])
 AC_OUTPUT