Fix: Override AM_PATH_PYTHON's default action-if-not-found

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f507883aff5d2cfad817ec2962f483976285ecdd..b04d4e35b656f5d4a0db74d12712245f8dbd40e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 
@@ -198,6 +199,7 @@ changequote([,])dnl
        tile*) NO_UNALIGNED_ACCESS=1 ;;
        *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac
+AC_MSG_RESULT([$host_cpu])
 
 if test x$NO_UNALIGNED_ACCESS = x ; then
 AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
@@ -265,6 +267,16 @@ AS_IF([test "x$with_sdt" = "xyes"],[
        ])
 ])
 
+AC_MSG_CHECKING([whether shared libraries are enabled])
+AS_IF([test "x$enable_shared" = "xyes"],
+       [
+               AC_MSG_RESULT([yes])
+       ],
+       [
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled])
+       ])
+
 AC_ARG_WITH([lttng-system-rundir],
        AS_HELP_STRING([--with-lttng-system-rundir],
        [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]),
@@ -276,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([