X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=d90479db4931a2ab902d8aefc74425d5ffad5cff;hp=c9bd25049111bf59b81e9b51df7d9b171e72c4da;hb=f7bbd50246fde81a4ef90fa6bd78e441fccdbb40;hpb=d199691ba17cc82d03b7c57a55a44d61f424f752

diff --git a/configure.ac b/configure.ac
index c9bd2504..d90479db 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.6], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[1.0.0-rc4],[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
 
@@ -35,9 +35,43 @@ 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.])]
+# Check for libuuid
+AC_CHECK_LIB([uuid], [uuid_generate],
+[
+	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
+	have_libuuid=yes
+],
+[
+	# libuuid not found, check for uuid_create in libc.
+	AC_CHECK_LIB([c], [uuid_create],
+	[
+		AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
+		have_libc_uuid=yes
+	],
+	[
+		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+	])
+]
+)
+AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
+AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
+
+# Check for fmemopen
+AC_CHECK_LIB([c], [fmemopen],
+[
+	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_FMEMOPEN], 1, [Has fmemopen support.])
+]
+)
+
+# Check for open_memstream
+AC_CHECK_LIB([c], [open_memstream],
+[
+	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_OPEN_MEMSTREAM], 1, [Has open_memstream support.])
+]
+)
+
+AC_CHECK_LIB([popt], [poptGetContext], [],
+        [AC_MSG_ERROR([Cannot find popt.])]
 )
 
 pkg_modules="gmodule-2.0 >= 2.0.0"
@@ -48,9 +82,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 +99,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
 ])