X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=05637f6bd54b21222ebb7ea9661f0585c6ef5e4c;hp=f8a80e5fbe0b965be49692dc375fe655ef1bf742;hb=634d474be8d4262f5a3e549cdb6891de239f4fe4;hpb=627516dbf47c3b6acae8a9fde088cf79430f8c7d

diff --git a/configure.ac b/configure.ac
index f8a80e5f..05637f6b 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.7], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[0.12],[mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -17,7 +17,7 @@ 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
 
@@ -40,6 +40,10 @@ 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)
@@ -48,9 +52,12 @@ LIBS="$LIBS $GMODULE_LIBS"
 PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 
-babeltraceincludedir="${includedir}"
+babeltraceincludedir="${includedir}/babeltrace"
 AC_SUBST(babeltraceincludedir)
 
+babeltracectfincludedir="${includedir}/babeltrace/ctf"
+AC_SUBST(babeltracectfincludedir)
+
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
@@ -62,7 +69,9 @@ AC_CONFIG_FILES([
 	formats/bt-dummy/Makefile
 	formats/ctf/metadata/Makefile
 	converter/Makefile
+	doc/Makefile
 	lib/Makefile
+	lib/prio_heap/Makefile
 	include/Makefile
 	tests/Makefile
 ])