X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=26bf5a59c153d731fc30b7293d39f2d35cf71983;hb=5b6ff569c0bf82b72f263a259e7a73a453903648;hp=7ed1a68cec42441de030a37435a013b19beb6816;hpb=e03082b1fc9eb134620c5a51ed15f8a35263c4d7;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 7ed1a68c..26bf5a59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,9 @@ AC_ARG_ENABLE([python-agent],
 	[:]
 )
 AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
+if test "x$python_agent" = "xyes"; then
+	AM_PATH_PYTHON([2.7])
+fi
 
 # sdt.h integration
 AC_ARG_WITH([sdt],
@@ -363,7 +366,7 @@ AC_ARG_WITH([lttng-system-rundir],
 AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
 	[LTTng system runtime directory])
 
-AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1,[:])
+AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES],[python],["yes"])
 AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp])
 
 AC_CONFIG_FILES([
@@ -391,17 +394,29 @@ AC_CONFIG_FILES([
 	liblttng-ust-libc-wrapper/Makefile
 	liblttng-ust-cyg-profile/Makefile
 	liblttng-ust-python-agent/Makefile
+	python-lttngust/Makefile
+	python-lttngust/setup.py
+	python-lttngust/lttngust/__init__.py
 	tools/Makefile
 	tests/Makefile
 	tests/hello/Makefile
 	tests/hello.cxx/Makefile
 	tests/same_line_tracepoint/Makefile
 	tests/snprintf/Makefile
+	tests/ust-elf/Makefile
 	tests/benchmark/Makefile
 	tests/utils/Makefile
 	lttng-ust.pc
 ])
 
+# Create link for python agent for the VPATH guru.
+AC_CONFIG_LINKS([
+	python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py
+	python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py
+	python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py
+	python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
+])
+
 AC_OUTPUT
 
 AS_ECHO()
@@ -423,7 +438,7 @@ AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disa
 AS_ECHO_N("JNI interface (JNI): ")
 AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
 
-AS_ECHO_N("Python agent: ")
+AS_ECHO_N("Python ($PYTHON) agent: ")
 AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
 
 AS_ECHO_N("sdt.h integration: ")