Fix: Skip lttng-gen-tp example build if Python is missing

Fixes #665

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index c8421b7b93abc1758c506a495717012f57f6a620..3c92da15fcf81a459fbc365d34c1d2bfcdad91a4 100644 (file)
--- 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 971eec3eb4ab4ee67043ddb9945af2138994f80a..0d341c82dff97e81cf5c1079747997a7a448514e 100644 (file)
--- 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 \