X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=4e9ea09084ef2eb568ee12481eb34231a5196b8c;hb=31592d1297d3cca30270ae94e34301fd3592f561;hp=a7a094a411d5d558f7ce633f0847dc1efaa57104;hpb=1077583f4a1943a8e4b838f13bf12349795038e2;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index a7a094a4..4e9ea090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_PREREQ([2.50])
 
 m4_define([bt_version_major], [2])
 m4_define([bt_version_minor], [0])
-m4_define([bt_version_patch], [2])
+m4_define([bt_version_patch], [3])
 m4_define([bt_version_dev_stage], [])
 m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_dev_stage)
 m4_define([bt_version_name], [Amqui])
@@ -363,15 +363,14 @@ AS_IF([test "x$BABELTRACE_DEBUG_MODE" = x1], [
 AC_ARG_ENABLE([python-bindings],
   [AC_HELP_STRING([--enable-python-bindings], [build the Python bindings])],
   [], dnl AC_ARG_ENABLE will fill enable_python_bindings with the user choice
-  [enable_python_bindings=no]
+  [enable_python_bindings=unspecified]
 )
 
 # Python plugins
 # Disabled by default
 AC_ARG_ENABLE([python-plugins],
-  [AC_HELP_STRING([--enable-python-plugins], [enable the Python plugins support for the library and converter])],
-  [], dnl AC_ARG_ENABLE will fill enable_python_plugins with the user choice
-  [enable_python_plugins=no]
+  [AC_HELP_STRING([--enable-python-plugins], [enable the Python plugins support for the library and converter])]
+  dnl AC_ARG_ENABLE will fill enable_python_plugins with the user choice
 )
 
 # Debug info
@@ -386,31 +385,28 @@ AC_ARG_ENABLE([debug-info],
 # Disabled by default
 AC_ARG_ENABLE([api-doc],
   [AC_HELP_STRING([--enable-api-doc], [build the HTML API documentation])],
-  [enable_api_doc=$enableval],
-  [enable_api_doc=no]
+  [enable_api_doc=$enableval]
 )
 
 # Built-in plugins
 # Disabled by default
 AC_ARG_ENABLE([built-in-plugins],
-  [AC_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace2 executable])],
-  [], dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
-  [enable_built_in_plugins=no]
+  [AC_HELP_STRING([--enable-built-in-plugins], [Statically-link in-tree plug-ins into the babeltrace2 executable])]
+  dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
 )
 
 # Built-in python plugin support
 # Disabled by default
 AC_ARG_ENABLE([built-in-python-plugin-support],
-  [AC_HELP_STRING([--enable-built-in-python-plugin-support], [Statically-link Python plugin support into the babeltrace library])],
-  [], dnl AC_ARG_ENABLE will fill enable_built_in_python_plugin_support with the user choice
-  [enable_built_in_python_plugin_support=no]
+  [AC_HELP_STRING([--enable-built-in-python-plugin-support], [Statically-link Python plugin support into the babeltrace library])]
+  dnl AC_ARG_ENABLE will fill enable_built_in_python_plugin_support with the user choice
 )
 
 # Man pages
 # Enabled by default
 AC_ARG_ENABLE([man-pages],
   [AS_HELP_STRING([--disable-man-pages], [Do not build and install man pages (already built in a distributed tarball])],
-  [], dnl AC_ARG_ENABLE will fill enable_built_in_plugins with the user choice
+  [], dnl AC_ARG_ENABLE will fill enable_man_pages with the user choice
   [enable_man_pages=yes]
 )
 
@@ -451,6 +447,29 @@ AS_IF([test "x$enable_debug_info" = xyes],
 
 AC_SUBST([ENABLE_DEBUG_INFO_VAL])
 
+# Check for conflicting Python related features user choices.
+AS_IF([test "x$enable_python_plugins" = xyes],
+  [
+    AS_IF([test "x$enable_python_bindings" = xunspecified],
+      [
+        # --enable-python-plugins was provided but --enable-python-bindings was
+        # omitted. Turn the Python bindings ON anyway because it's needed to
+        # use the Python plugins.
+        enable_python_bindings=yes
+      ],
+      [
+        AS_IF([test "x$enable_python_bindings" = xno],
+          [
+            # --enable-python-plugins _and_ --disable-python-bindings were
+            # used. This is invalid because Python plugins need the Python
+            # bindings to be useful.
+            AC_MSG_ERROR(--enable-python-bindings must be used to support Python plugins)
+          ]
+        )
+      ]
+    )
+  ]
+)
 
 # Check for conflicting optional features user choices
 
@@ -464,7 +483,7 @@ AS_IF([test "x$enable_built_in_plugins" = xyes],
 
 AS_IF([test "x$enable_built_in_python_plugin_support" = xyes],
   [
-    AS_IF([test "x$enable_python_plugins" = xno], [AC_MSG_ERROR([--enable-python-plugins must be used to bundle Python plugin support in the babeltrace2 executable])])
+    AS_IF([test "x$enable_python_plugins" != xyes], [AC_MSG_ERROR([--enable-python-plugins must be used to bundle Python plugin support in the babeltrace2 executable])])
     # 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 babeltrace2 executable)])
     AS_IF([test "x$enable_shared" = xyes], [AC_MSG_ERROR(--disable-shared must be used to bundle Python plugin support in the babeltrace2 executable)])