AC_PROG_LIBTOOL is deprecated in favor of LT_INIT

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 80738a070d2c5ccc9f9496d2b5566fadd5630027..690feb6e861d3090cde2883b77887009bc815cd3 100644 (file)
--- 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.3], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[0.7],[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,6 +52,9 @@ LIBS="$LIBS $GMODULE_LIBS"
 PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 
+babeltraceincludedir="${includedir}"
+AC_SUBST(babeltraceincludedir)
+
 AC_CONFIG_FILES([
        Makefile
        types/Makefile