Update glib dep to 2.22 in configure.ac

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1f1d28449f9865399f49f94998d43ca93873d85c..e4ce4e09a4720a148bb65e77ce61f1559b9e79cc 100644 (file)
--- 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,11 +35,17 @@ 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)
 
-PACKAGE_CFLAGS="$GMODULE_CFLAGS"
+LIBS="$LIBS $GMODULE_LIBS"
+PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 
 AC_CONFIG_FILES([
@@ -46,6 +54,8 @@ 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
        tests/Makefile