X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=c3809bee7e17336dde1e5ebb5e573737711777a1;hb=e98a2d6e0c0c7a9f28e620ce975b8c242ee20c9f;hp=450e22491a67e64fc0b79db3749b5c560374dd12;hpb=235d06f02f6f0306e432165fdcb11d9a6debd480;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 450e2249..c3809bee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([babeltrace],[2.0.0-pre],[jeremie dot galarneau at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0])
+AC_SUBST([BABELTRACE_LIBRARY_VERSION], [2:0:0])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -231,6 +231,10 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
         [AC_MSG_ERROR([Cannot find popt.])]
 )
 
+# Plugins
+AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace/plugins]])
+AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace/plugins'])
+
 # For Python
 # SWIG version needed or newer:
 swig_version=2.0.0
@@ -307,7 +311,7 @@ AS_IF([test "x$_enable_debug_info" = xyes], [
 	    # Check if libelf and libdw are present
 	    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
 	    AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
-	    AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
+	    BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
             AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])
 ], [])
 
@@ -332,10 +336,17 @@ AC_SUBST(babeltracectfwriterincludedir)
 babeltracectfirincludedir="${includedir}/babeltrace/ctf-ir"
 AC_SUBST(babeltracectfirincludedir)
 
+babeltracepluginincludedir="${includedir}/babeltrace/plugin"
+AC_SUBST(babeltracepluginincludedir)
+
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
 	compat/Makefile
+	ctf-reader-proto/Makefile
+	ctf-reader-proto/metadata-parsing/Makefile
+	ctf-reader-proto/ctf-notif-iter/Makefile
+	ctf-reader-proto/ctf-btr/Makefile
 	formats/Makefile
 	formats/ctf/Makefile
 	formats/ctf/types/Makefile
@@ -354,6 +365,7 @@ AC_CONFIG_FILES([
 	doc/images/Makefile
 	lib/Makefile
 	lib/prio_heap/Makefile
+	lib/plugin-system/Makefile
 	include/Makefile
 	bindings/Makefile
 	bindings/python/Makefile
@@ -366,6 +378,11 @@ AC_CONFIG_FILES([
 	tests/utils/tap/Makefile
 	extras/Makefile
 	extras/valgrind/Makefile
+	plugins/Makefile
+	plugins/ctf/Makefile
+	plugins/ctf/fs/Makefile
+	plugins/ctf/lttng-live/Makefile
+	plugins/text/Makefile
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])