X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=c9efc31cabbd548e1ec931659a602a190dd89468;hp=1f1d28449f9865399f49f94998d43ca93873d85c;hb=f57447bdfc29e7390c32661341ef50ae1d9ab208;hpb=8b9d5b5e700bdf66edf4c0fa035fdf10cb3b36f3

diff --git a/configure.ac b/configure.ac
index 1f1d2844..c9efc31c 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], [0.1], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[0.10],[mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -17,11 +17,13 @@ AC_CONFIG_HEADERS([config.h])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT
 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,21 +35,41 @@ 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.])]
+)
+
+AC_CHECK_LIB([popt], [poptGetContext], [],
+        [AC_MSG_ERROR([Cannot find popt.])]
+)
+
 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)
 
+babeltraceincludedir="${includedir}/babeltrace"
+AC_SUBST(babeltraceincludedir)
+
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
 	formats/Makefile
 	formats/ctf/Makefile
 	formats/ctf/types/Makefile
+	formats/ctf-text/Makefile
+	formats/ctf-text/types/Makefile
+	formats/bt-dummy/Makefile
 	formats/ctf/metadata/Makefile
 	converter/Makefile
+	doc/Makefile
+	lib/Makefile
+	lib/prio_heap/Makefile
+	include/Makefile
 	tests/Makefile
 ])
 AC_OUTPUT