X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=bf7c6d58001d3bf5e812a8feca11f7075437aa64;hb=8654d3067604d63b6df17571cac79c4485d6496f;hp=d48be53b6904ec3ac67fa57d569349da5346474a;hpb=e0dfa761f98d627ba5083e99f23d40528b2c4f14;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index d48be53b..bf7c6d58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_CHECK_HEADERS([ \
 	sys/socket.h \
 ])
 
-if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
+if test ! -f "$srcdir/plugins/ctf/common/metadata/parser.h"; then
         if test x"$(basename "$YACC")" != "xbison -y"; then
                 AC_MSG_ERROR([[bison not found and is required when building from git.
                 Please install bison]])
@@ -72,7 +72,7 @@ if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
         ])
 fi
 
-if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; then
+if test ! -f "$srcdir/plugins/ctf/common/metadata/lexer.c"; then
         if test x"$LEX" != "xflex"; then
                 AC_MSG_ERROR([[flex not found and is required when building from git.
                 Please install flex]])
@@ -376,6 +376,16 @@ AS_IF([test "x$BUILT_IN_PLUGINS" != x], [
 ])
 AM_CONDITIONAL([BUILT_IN_PLUGINS], [test "x$built_in_plugins" = "xyes"])
 
+AC_ARG_VAR([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [Statically-link Python plugin support into the babeltrace binary])
+AS_IF([test "x$BUILT_IN_PYTHON_PLUGIN_SUPPORT" != 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 Python plugin support in the babeltrace executable)])
+  AS_IF([test "x$enable_shared" = "xyes"], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace executable)])
+  built_in_python_plugin_support=yes
+  AC_DEFINE([BT_BUILT_IN_PYTHON_PLUGIN_SUPPORT], [1], [Define to 1 to register plug-in attributes in static executable sections])
+])
+AM_CONDITIONAL([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$built_in_python_plugin_support" = "xyes"])
+
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 
 LIBS="$LIBS $GMODULE_LIBS"
@@ -388,23 +398,20 @@ AC_SUBST(DEFAULT_INCLUDES)
 babeltraceincludedir="${includedir}/babeltrace"
 AC_SUBST(babeltraceincludedir)
 
-babeltracectfincludedir="${includedir}/babeltrace/ctf"
-AC_SUBST(babeltracectfincludedir)
-
 babeltracectfwriterincludedir="${includedir}/babeltrace/ctf-writer"
 AC_SUBST(babeltracectfwriterincludedir)
 
+babeltracectfincludedir="${includedir}/babeltrace/ctf"
+AC_SUBST(babeltracectfincludedir)
+
 babeltracectfirincludedir="${includedir}/babeltrace/ctf-ir"
 AC_SUBST(babeltracectfirincludedir)
 
 babeltracepluginincludedir="${includedir}/babeltrace/plugin"
 AC_SUBST(babeltracepluginincludedir)
 
-babeltracecomponentincludedir="${includedir}/babeltrace/component"
-AC_SUBST(babeltracecomponentincludedir)
-
-babeltracecomponentnotifincludedir="${includedir}/babeltrace/component/notification"
-AC_SUBST(babeltracecomponentnotifincludedir)
+babeltracegraphincludedir="${includedir}/babeltrace/graph"
+AC_SUBST(babeltracegraphincludedir)
 
 program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name"
 AC_SUBST(program_transform_name)
@@ -437,24 +444,12 @@ AS_IF([test "x$enable_api_doc" = "xyes"], [
 
 AC_CONFIG_FILES([
 	Makefile
-	types/Makefile
 	common/Makefile
 	compat/Makefile
-	formats/Makefile
-	formats/ctf/Makefile
-	formats/ctf/types/Makefile
-	formats/ctf-text/Makefile
-	formats/ctf-text/types/Makefile
-	formats/ctf-metadata/Makefile
-	formats/bt-dummy/Makefile
-	formats/lttng-live/Makefile
-	formats/ctf/metadata/Makefile
-	formats/ctf/writer/Makefile
-	formats/ctf/ir/Makefile
-	converter/Makefile
+	cli/Makefile
 	doc/Makefile
-        doc/api/Makefile
-        doc/api/Doxyfile
+	doc/api/Makefile
+	doc/api/Doxyfile
 	doc/bindings/Makefile
 	doc/bindings/python/Makefile
 	doc/images/Makefile
@@ -463,6 +458,8 @@ AC_CONFIG_FILES([
 	lib/plugin/Makefile
         lib/component/Makefile
 	lib/component/notification/Makefile
+	lib/ctf-ir/Makefile
+	lib/ctf-writer/Makefile
 	include/Makefile
 	bindings/Makefile
 	bindings/python/Makefile
@@ -496,6 +493,8 @@ AC_CONFIG_FILES([
 	plugins/utils/Makefile
 	plugins/utils/dummy/Makefile
 	plugins/utils/trimmer/Makefile
+	python-plugin-provider/Makefile
+	plugins/libctfcopytrace/Makefile
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])
@@ -513,7 +512,6 @@ AC_CONFIG_FILES([tests/bin/intersection/test_intersection], [chmod +x tests/bin/
 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])
 
 AS_IF([test "x$enable_python" = "xyes"], [
 	AC_CONFIG_FILES(
@@ -571,6 +569,10 @@ PPRINT_PROP_BOOL([Python bindings tests], $value)
 test "x$enable_python_plugins" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Python plugin support], $value)
 
+# built-in Python plugin support enabled/disabled
+test "x$built_in_python_plugin_support" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Built-in Python plugin support], $value)
+
 # debug info enabled/disabled
 test "x$_enable_debug_info" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Debug information output], $value)