X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=632602f2a47fb2a21fea6945ab9503bda5e45f65;hb=cd7d8fb7b8a599187c9d0e479969c86cf5640397;hp=ac7e43934a6b8a1c749c89198a2f4e0df432f637;hpb=34ac9eaff6dd507c75139d6f8d1870ef7a341d66;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index ac7e4393..632602f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,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"
@@ -339,6 +349,38 @@ AC_SUBST(babeltracectfirincludedir)
 babeltracepluginincludedir="${includedir}/babeltrace/plugin"
 AC_SUBST(babeltracepluginincludedir)
 
+babeltracecomponentincludedir="${includedir}/babeltrace/component"
+AC_SUBST(babeltracecomponentincludedir)
+
+program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name"
+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
@@ -356,13 +398,16 @@ 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
+	lib/plugin/Makefile
+        lib/component/Makefile
+	lib/component/notification/Makefile
 	include/Makefile
 	bindings/Makefile
 	bindings/python/Makefile
@@ -371,6 +416,8 @@ AC_CONFIG_FILES([
 	tests/bin/Makefile
 	tests/bin/intersection/Makefile
 	tests/lib/Makefile
+	tests/lib/writer/Makefile
+	tests/lib/test-plugin-plugins/Makefile
 	tests/utils/Makefile
 	tests/utils/tap/Makefile
 	extras/Makefile
@@ -383,13 +430,17 @@ AC_CONFIG_FILES([
 	plugins/ctf/common/notif-iter/Makefile
 	plugins/ctf/fs/Makefile
 	plugins/ctf/lttng-live/Makefile
-	plugins/correlator/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_plugin_complete], [chmod +x tests/lib/test_plugin_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])
 AC_CONFIG_FILES([tests/lib/test_dwarf_complete], [chmod +x tests/lib/test_dwarf_complete])
@@ -398,6 +449,7 @@ AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin
 AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read])
 AC_CONFIG_FILES([tests/bin/intersection/test_intersection], [chmod +x tests/bin/intersection/test_intersection])
 AC_CONFIG_FILES([tests/bin/intersection/bt_python_helper.py])
+AC_CONFIG_FILES([tests/lib/writer/bt_python_helper.py])
 AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num])
 AC_CONFIG_FILES([tests/bin/test_formats], [chmod +x tests/bin/test_formats])
 
@@ -430,6 +482,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)
@@ -442,6 +498,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`"