[lttng-dev] [PATCH lttng-tools 1/3] Build: rename use_python to python_binding

[Jérémie Galarneau]

Merged, thanks!

Jérémie

On Thu, Aug 6, 2015 at 7:00 PM, Jonathan Rajotte
<jonathan.rajotte-julien at efficios.com> wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
>  configure.ac                     | 8 ++++----
>  extras/bindings/swig/Makefile.am | 2 +-
>  tests/Makefile.am                | 4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 4e6c06e..312b9f7 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -333,11 +333,11 @@ 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
>
> @@ -608,7 +608,7 @@ AS_IF([test "x$test_java_agent_log4j" = "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")
> diff --git a/extras/bindings/swig/Makefile.am b/extras/bindings/swig/Makefile.am
> index dcd868d..f1100d9 100644
> --- a/extras/bindings/swig/Makefile.am
> +++ b/extras/bindings/swig/Makefile.am
> @@ -1,3 +1,3 @@
> -if USE_PYTHON
> +if PYTHON_BINDING
>  SUBDIRS = python
>  endif
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 2f1f1c3..d72b1ec 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -3,14 +3,14 @@ SUBDIRS = utils regression unit stress
>  installcheck-am:
>         ./run.sh unit_tests
>         ./run.sh fast_regression
> -if USE_PYTHON
> +if PYTHON_BINDING
>         ./run.sh with_bindings_regression
>  endif
>
>  check-am:
>         ./run.sh unit_tests
>         ./run.sh fast_regression
> -if USE_PYTHON
> +if PYTHON_BINDING
>         ./run.sh with_bindings_regression
>  endif
>
> --
> 2.1.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com