Add MIT-licensed priority heap, based on CLRS, chap. 6

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d1d4feab6ba5b063e0674835486b1336adaa6ccf..b6e8d6503bd820d0a6c3f5433b8f27926368d7d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,12 @@ AC_CONFIG_HEADERS([config.h])
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_MAKE_SET
 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
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE


@@ -31,11 +35,17 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([bzero gettimeofday munmap strtoul])
 
 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)
 
 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([
 AC_SUBST(PACKAGE_CFLAGS)
 
 AC_CONFIG_FILES([


@@ -44,6 +54,11 @@ AC_CONFIG_FILES([
        formats/Makefile
        formats/ctf/Makefile
        formats/ctf/types/Makefile
        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
        tests/Makefile
 ])
 AC_OUTPUT