X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=45e92853ab2acf519f993dddc16dfcf0a333cfe0;hb=95a90d01ce90630d2c070d21b25f4fe7493d89db;hp=71949f25994d36570e853758404b07c7a5287599;hpb=34f69498c4065ad2d4ae47217a0655a030f12647;p=lttng-tools.git diff --git a/configure.ac b/configure.ac index 71949f259..45e92853a 100644 --- a/configure.ac +++ b/configure.ac @@ -314,13 +314,13 @@ swig_version=2.0.0 AC_ARG_ENABLE([python-bindings], [AC_HELP_STRING([--enable-python-bindings], [compile Python bindings])], - [enable_python=yes], [enable_python=no]) + [enable_python_binding=yes], [enable_python_binding=no]) -AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes]) +AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) -if test "x${enable_python:-yes}" = xyes; then +if test "x${enable_python_binding:-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_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config]) AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config]) @@ -539,6 +539,7 @@ AC_CONFIG_FILES([ tests/regression/ust/java-log4j/Makefile tests/regression/ust/python-logging/Makefile tests/regression/ust/getcpu-override/Makefile + tests/regression/ust/clock-override/Makefile tests/stress/Makefile tests/unit/Makefile tests/unit/ini_config/Makefile @@ -594,7 +595,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"],[ #Python binding enabled/disabled AS_ECHO_N("Python binding: ") -AS_IF([test "x${enable_python:-yes}" = xyes], [ +AS_IF([test "x${enable_python_binding:-yes}" = xyes], [ AS_ECHO("Enabled") ],[ AS_ECHO("Disabled")