X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=84fae3c356c7a628113b3eb9a5b48c0ca5564905;hb=cfa45a3c4afcc24efa49d83117015533647a24e2;hp=554a5b05ef2d273fe68a41344792faee63149188;hpb=9cf643d1c6524358b231b0f143103aabfa3e5773;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index 554a5b05..84fae3c3 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]])
@@ -242,36 +242,28 @@ swig_version=2.0.0
 AC_ARG_ENABLE([python-bindings],
               [AC_HELP_STRING([--enable-python-bindings],
                               [generate Python bindings])],
-              [enable_python=yes], [enable_python=no])
+              [enable_python_bindings=yes], [enable_python_bindings=no])
 
-AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes])
+AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python_bindings:-yes}" = xyes])
 
-AC_ARG_ENABLE([python-bindings-doc],
-              [AC_HELP_STRING([--enable-python-bindings-doc],
-                              [generate Python bindings documentation])],
-              [enable_python_bindings_doc=yes], [enable_python_bindings_doc=no])
-
-AC_ARG_ENABLE([python-bindings-tests],
-              [AC_HELP_STRING([--enable-python-bindings-tests],
-                              [test Python bindings])],
-              [enable_python_bindings_tests=yes], [enable_python_bindings_tests=no])
-
-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_TESTS], [test "x${enable_python_bindings_tests:-yes}" = xyes])
-
-if test "x${enable_python:-no}" = xno; then
-  if test "x${enable_python_bindings_doc:-yes}" = xyes; then
-    AC_MSG_ERROR([--enable-python-bindings-doc was specified without --enable-python-bindings])
-  fi
+AC_ARG_ENABLE(
+	[python-plugins],
+	[AC_HELP_STRING(
+		[--enable-python-plugins],
+		[add support for the Babeltrace library and converter to load Python plugins])
+	],
+	[enable_python_plugins=yes],
+	[enable_python_plugins=no]
+)
 
-  if test "x${enable_python_bindings_tests:-yes}" = xyes; then
-    AC_MSG_ERROR([--enable-python-bindings-tests was specified without --enable-python-bindings])
-  fi
+if test "x${enable_python_bindings:-yes}" = xyes; then
+  AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
+else
+    AC_MSG_NOTICE([You may configure with --enable-python-bindings ]dnl
+[if you want Python bindings.])
 fi
 
-AM_CONDITIONAL([BUILD_PYTHON_BINDINGS_DOC], [test "x${enable_python_bindings_doc:-yes}" = xyes])
-
-if test "x${enable_python:-yes}" = xyes; then
-  AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
+if test "x$enable_python_bindings" != xno || test "x$enable_python_plugins" != xno; then
   AM_PATH_PYTHON([3.0], , [AC_MSG_ERROR(Python3 is not available or is not the default Python interpreter on your system. See the README file to learn how to override your distribution's default Python interpreter.)])
 
   AM_PATH_PYTHON_MODULES([PYTHON])
@@ -279,7 +271,8 @@ if test "x${enable_python:-yes}" = xyes; then
   pythondir=$PYTHON_PREFIX/$PYTHON_MODULES_PATH
   # pyexecdir is the path that contains shared objects used by the extra modules
   pyexecdir=$PYTHON_EXEC_PREFIX/$PYTHON_MODULES_PATH
-  AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
+  AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for Python, bypassing python-config])
+  AC_ARG_VAR([PYTHON_LIBS], [Library flags for Python, bypassing python-config])
   AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
   AS_IF([test -z "$PYTHON_INCLUDE"], [
     AS_IF([test -z "$PYTHON_CONFIG"], [
@@ -289,14 +282,52 @@ if test "x${enable_python:-yes}" = xyes; then
                     [`dirname $PYTHON`])
       AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Do you have python-dev installed?])])
     ])
-    AC_MSG_CHECKING([python include flags])
+    AC_MSG_CHECKING([Python include flags])
     PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
     AC_MSG_RESULT([$PYTHON_INCLUDE])
   ])
-else
-    AC_MSG_NOTICE([You may configure with --enable-python-bindings ]dnl
-[if you want Python bindings.])
+  AS_IF([test -z "$PYTHON_LIBS"], [
+    AS_IF([test -z "$PYTHON_CONFIG"], [
+      AC_PATH_PROGS([PYTHON_CONFIG],
+                    [python$PYTHON_VERSION-config python-config],
+                    [no],
+                    [`dirname $PYTHON`])
+      AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON. Do you have python-dev installed?])])
+    ])
+    AC_MSG_CHECKING([Python library flags])
+    PYTHON_LIBS=`$PYTHON_CONFIG --libs`
+    AC_MSG_RESULT([$PYTHON_LIBS])
+  ])
+fi
+
+AM_CONDITIONAL([WITH_PYTHON_PLUGINS], [test "x$enable_python_plugins" != xno])
+AS_IF(
+  [test "x$enable_python_plugins" != xno],
+  AC_DEFINE_UNQUOTED([WITH_PYTHON_PLUGINS], [1], [Python plugin support.])
+)
+
+AC_ARG_ENABLE([python-bindings-doc],
+              [AC_HELP_STRING([--enable-python-bindings-doc],
+                              [generate Python bindings documentation])],
+              [enable_python_bindings_doc=yes], [enable_python_bindings_doc=no])
 
+AM_CONDITIONAL([BUILD_PYTHON_BINDINGS_DOC], [test "x${enable_python_bindings_doc:-yes}" = xyes])
+
+AC_ARG_ENABLE([python-bindings-tests],
+              [AC_HELP_STRING([--enable-python-bindings-tests],
+                              [test Python bindings])],
+              [enable_python_bindings_tests=yes], [enable_python_bindings_tests=no])
+
+AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS_TESTS], [test "x${enable_python_bindings_tests:-yes}" = xyes])
+
+if test "x${enable_python_bindings:-no}" = xno; then
+  if test "x${enable_python_bindings_doc:-yes}" = xyes; then
+    AC_MSG_ERROR([--enable-python-bindings-doc was specified without --enable-python-bindings])
+  fi
+
+  if test "x${enable_python_bindings_tests:-yes}" = xyes; then
+    AC_MSG_ERROR([--enable-python-bindings-tests was specified without --enable-python-bindings])
+  fi
 fi
 
 if test "x${enable_python_bindings_doc:-yes}" = xyes; then
@@ -345,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"
@@ -357,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)
@@ -406,23 +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
@@ -431,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
@@ -460,8 +489,13 @@ AC_CONFIG_FILES([
 	plugins/ctf/lttng-live/Makefile
 	plugins/muxer/Makefile
 	plugins/text/Makefile
-	plugins/trimmer/Makefile
 	plugins/writer/Makefile
+	plugins/utils/Makefile
+	plugins/utils/dummy/Makefile
+	plugins/utils/trimmer/Makefile
+	python-plugin-provider/Makefile
+	plugins/libctfcopytrace/Makefile
+	plugins/debug-info/Makefile
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])
@@ -479,7 +513,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(
@@ -522,7 +555,7 @@ 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
+test "x$enable_python_bindings" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Python bindings], $value)
 
 # python bindings doc enabled/disabled
@@ -533,6 +566,14 @@ PPRINT_PROP_BOOL([Python bindings doc], $value)
 test "x$enable_python_bindings_tests" = "xyes" && value=1 || value=0
 PPRINT_PROP_BOOL([Python bindings tests], $value)
 
+# python plugins enabled/disabled
+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)