X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=eb14fbd5c337ff343bb7de8fc9905b1f162a9713;hb=5fd17f7375186eeba668a7717f6fd062999e3683;hp=faa3f98472a5e7541d77f9c3efa76b23664df880;hpb=99e3ba41ff0cb379032b7efa89392a6216091efa;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index faa3f984..eb14fbd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,8 +121,13 @@ AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-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]) ])
-  AM_PATH_PYTHON
+  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])
+  # pythondir is the path where extra modules are to be installed
+  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_CONFIG], [Path to python-config])
   AS_IF([test -z "$PYTHON_INCLUDE"], [
@@ -161,6 +166,9 @@ AC_SUBST(babeltracectfincludedir)
 babeltracectfwriterincludedir="${includedir}/babeltrace/ctf-writer"
 AC_SUBST(babeltracectfwriterincludedir)
 
+babeltracectfirincludedir="${includedir}/babeltrace/ctf-ir"
+AC_SUBST(babeltracectfirincludedir)
+
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
@@ -175,6 +183,7 @@ AC_CONFIG_FILES([
 	formats/lttng-live/Makefile
 	formats/ctf/metadata/Makefile
 	formats/ctf/writer/Makefile
+	formats/ctf/ir/Makefile
 	converter/Makefile
 	doc/Makefile
 	lib/Makefile