Merged, thanks! Mathieu
----- Original Message ----- > From: "Jérémie Galarneau" <[email protected]> > To: [email protected] > Cc: "mathieu desnoyers" <[email protected]>, "Jérémie Galarneau" > <[email protected]> > Sent: Tuesday, April 1, 2014 11:49:58 AM > Subject: [PATCH lttng-ust] Fix: Override AM_PATH_PYTHON's default > action-if-not-found > > AM_PATH_PYTHON's default action aborts configure. This fix ensures that > configure follows through with a noop. > > Signed-off-by: Jérémie Galarneau <[email protected]> > --- > configure.ac | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index d4926e4..b04d4e3 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -288,7 +288,7 @@ 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_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([ > -- > 1.9.1 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
