[lttng-dev] [PATCH lttng-ust] Fix: Skip lttng-gen-tp example build if Python is missing

[lttng-dev] [PATCH lttng-ust] Fix: Skip lttng-gen-tp example build if Python is missing

[Jérémie Galarneau]

Fixes #665

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 configure.ac             | 3 +++
 doc/examples/Makefile.am | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c8421b7..3c92da1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,6 +276,9 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
 lttnglibjavadir="${libdir}/lttng/java"
 AC_SUBST(lttnglibjavadir)
 
+AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1)
+AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp])
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 971eec3..0d341c8 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -43,7 +43,11 @@ if NO_SHARED
 # disabled.
 else
 # Copies are for VPATH build support
-SUBDIRS_PROXY = easy-ust demo gen-tp hello-static-lib
+SUBDIRS_PROXY = easy-ust demo hello-static-lib
+
+if BUILD_GEN_TP_EXAMPLES
+SUBDIRS_PROXY += gen-tp
+endif
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-- 
1.9.0

[lttng-dev] [PATCH lttng-ust] Fix: Skip lttng-gen-tp example build if Python is missing

[Mathieu Desnoyers]

merged, thanks!

Mathieu

----- Original Message -----
> From: "J?r?mie Galarneau" <jeremie.galarneau@efficios.com>
> To: lttng-dev at lists.lttng.org
> Sent: Thursday, February 27, 2014 12:30:41 PM
> Subject: [lttng-dev] [PATCH lttng-ust] Fix: Skip lttng-gen-tp example build	if Python is missing
> 
> Fixes #665
> 
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  configure.ac             | 3 +++
>  doc/examples/Makefile.am | 6 +++++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index c8421b7..3c92da1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -276,6 +276,9 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR],
> ["$lttng_system_rundir"],
>  lttnglibjavadir="${libdir}/lttng/java"
>  AC_SUBST(lttnglibjavadir)
>  
> +AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1)
> +AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES],
> [Build examples requiring lttng-gen-tp])
> +
>  AC_CONFIG_FILES([
>  	Makefile
>  	doc/Makefile
> diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
> index 971eec3..0d341c8 100644
> --- a/doc/examples/Makefile.am
> +++ b/doc/examples/Makefile.am
> @@ -43,7 +43,11 @@ if NO_SHARED
>  # disabled.
>  else
>  # Copies are for VPATH build support
> -SUBDIRS_PROXY = easy-ust demo gen-tp hello-static-lib
> +SUBDIRS_PROXY = easy-ust demo hello-static-lib
> +
> +if BUILD_GEN_TP_EXAMPLES
> +SUBDIRS_PROXY += gen-tp
> +endif
>  
>  all-local:
>  	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> --
> 1.9.0
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> 

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com