X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=4adacc0be227e3e872623d1060cbaca04733e36b;hb=c1870f576149d488615883a7cfd12eddf78bd46a;hp=9e36c48e4d2d441bb33a63eaf00da91789a1a345;hpb=6a29d9fdf573e71039efd407da89e36f8c11ee42;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 9e36c48e..4adacc0b 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
@@ -311,6 +315,16 @@ AS_IF([test "x$_enable_debug_info" = xyes], [
             AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])
 ], [])
 
+AC_ARG_VAR([BUILT_IN_PLUGINS], [Statically-link in-tree plug-ins into the babeltrace binary])
+AS_IF([test "x$BUILT_IN_PLUGINS" != x], [
+# Built-in plug-ins are only available when the --disable-shared --enable-static options are used.
+	AS_IF([test "x$enable_static" != "xyes"], [AC_MSG_ERROR(--enable-static must be used to bundle plug-ins in the babeltrace executable)])
+	AS_IF([test "x$enable_shared" = "xyes"], [AC_MSG_ERROR(--disable-shared must be used to bundle plug-ins in the babeltrace executable)])
+	built_in_plugins=yes
+	AC_DEFINE([BT_BUILT_IN_PLUGINS], [1], [Define to 1 to register plug-in attributes in static executable sections])
+])
+AM_CONDITIONAL([BUILT_IN_PLUGINS], [test "x$built_in_plugins" = "xyes"])
+
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 
 LIBS="$LIBS $GMODULE_LIBS"
@@ -335,6 +349,35 @@ AC_SUBST(babeltracectfirincludedir)
 babeltracepluginincludedir="${includedir}/babeltrace/plugin"
 AC_SUBST(babeltracepluginincludedir)
 
+program_transform_name='s/babeltrace[\].bin/babeltrace/g'
+AC_SUBST(program_transform_name)
+
+# check for Doxygen
+AC_ARG_ENABLE(
+  [api-doc],
+  [AC_HELP_STRING(
+    [--enable-api-doc],
+    [generate and install HTML API documentation]
+  )],
+  [enable_api_doc=$enableval],
+  [enable_api_doc=no]
+)
+AM_CONDITIONAL([ENABLE_API_DOC], [test "x$enable_api_doc" = "xyes"])
+
+AS_IF([test "x$enable_api_doc" = "xyes"], [
+  DX_DOXYGEN_FEATURE(ON)
+  DX_DOT_FEATURE(OFF)
+  DX_HTML_FEATURE(ON)
+  DX_CHM_FEATURE(OFF)
+  DX_CHI_FEATURE(OFF)
+  DX_MAN_FEATURE(OFF)
+  DX_RTF_FEATURE(OFF)
+  DX_XML_FEATURE(OFF)
+  DX_PDF_FEATURE(OFF)
+  DX_PS_FEATURE(OFF)
+  DX_INIT_DOXYGEN([Babeltrace], [$(srcdir)/Doxyfile], [output])
+])
+
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
@@ -352,12 +395,15 @@ AC_CONFIG_FILES([
 	formats/ctf/ir/Makefile
 	converter/Makefile
 	doc/Makefile
+        doc/api/Makefile
+        doc/api/Doxyfile
 	doc/bindings/Makefile
 	doc/bindings/python/Makefile
 	doc/images/Makefile
 	lib/Makefile
 	lib/prio_heap/Makefile
 	lib/plugin-system/Makefile
+	lib/plugin-system/notification/Makefile
 	include/Makefile
 	bindings/Makefile
 	bindings/python/Makefile
@@ -372,13 +418,21 @@ AC_CONFIG_FILES([
 	extras/valgrind/Makefile
 	plugins/Makefile
 	plugins/ctf/Makefile
+	plugins/ctf/common/Makefile
+	plugins/ctf/common/btr/Makefile
+	plugins/ctf/common/metadata/Makefile
+	plugins/ctf/common/notif-iter/Makefile
 	plugins/ctf/fs/Makefile
 	plugins/ctf/lttng-live/Makefile
+	plugins/muxer/Makefile
 	plugins/text/Makefile
+	plugins/trimmer/Makefile
+	plugins/writer/Makefile
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])
 
+#AC_CONFIG_FILES([converter/babeltrace], [chmod +x converter/babeltrace])
 AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete])
 AC_CONFIG_FILES([tests/lib/test_seek_big_trace], [chmod +x tests/lib/test_seek_big_trace])
 AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_seek_empty_packet])
@@ -420,6 +474,10 @@ done
 ]
 PPRINT_PROP_STRING([Target architecture], $target_arch)
 
+# API doc
+test "x$enable_api_doc" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([HTML API documentation], $value)
+
 # python bindings enabled/disabled
 test "x$enable_python" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Python bindings], $value)
@@ -432,6 +490,9 @@ PPRINT_PROP_BOOL([Python bindings doc], $value)
 test "x$_enable_debug_info" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Debug information output], $value)
 
+# built-in plug-ins enabled/disabled
+test "x$built_in_plugins" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Built-in plug-ins], $value)
 
 report_bindir="`eval eval echo $bindir`"
 report_libdir="`eval eval echo $libdir`"