X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=b6e8d6503bd820d0a6c3f5433b8f27926368d7d3;hp=5743cada9d03bef1d3b4e4738fbca811ffee54bb;hb=255b2138aafa746f08e410e1f239165cec43edaf;hpb=34d3acc4fc9f020b0e2616a29a339b5c546a05c1

diff --git a/configure.ac b/configure.ac
index 5743cada..b6e8d650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,9 @@ AC_PROG_LIBTOOL
 AC_PROG_YACC
 AC_PROG_LEX
 
-AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) 
+
+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)
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -33,6 +35,11 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([bzero gettimeofday munmap strtoul])
 
+# Check libuuid
+AC_CHECK_LIB([uuid], [uuid_generate], [],
+	[AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])]
+)
+
 pkg_modules="gmodule-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 AC_SUBST(PACKAGE_LIBS)
@@ -47,8 +54,11 @@ AC_CONFIG_FILES([
 	formats/Makefile
 	formats/ctf/Makefile
 	formats/ctf/types/Makefile
+	formats/ctf-text/Makefile
+	formats/ctf-text/types/Makefile
 	formats/ctf/metadata/Makefile
 	converter/Makefile
+	lib/Makefile
 	tests/Makefile
 ])
 AC_OUTPUT