X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=ede0195213e823b94b6981a2018d4f53c786c6ee;hb=6db646dfa4f2b82dd98d145a58f9206c8b68f09e;hp=8bbf7b9b15295db0a06279fb9d9a5dc99933f0bc;hpb=bb9b5c2db164050bc87f6069df5453d0bd684290;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 8bbf7b9b..ede01952 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.7.0-pre],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.8.0-pre],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar])
 AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
@@ -41,11 +41,12 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
-version_name="Gaia"
-version_description="From Benelux brewery in Montreal, the Gaia is a witbier with a cloudy light amber ale color. Aroma of coriander with floral hay notes is enchanting. Taste is also dominated by the very floral coriander note and some medium sweet malt notes."
+version_name="Herbe à Détourne"
+version_description='Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.'
+version_description_c=$(echo $version_description | sed 's/"/\\"/g')
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
-AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], [UST version description])
 
 AC_PROG_GREP
 AC_PROG_LN_S
@@ -255,7 +256,7 @@ fi
 # Check for JNI header files if requested
 AC_ARG_ENABLE([jni-interface],
 	[AS_HELP_STRING([--enable-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])],
-	[jni_interface=$withval],
+	[jni_interface=$enableval],
 	[jni_interface=no]
 )
 
@@ -318,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],
@@ -362,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([
@@ -381,12 +385,17 @@ AC_CONFIG_FILES([
 	liblttng-ust-java/Makefile
 	liblttng-ust-java-agent/Makefile
 	liblttng-ust-java-agent/java/Makefile
+	liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
+	liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
+	liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
 	liblttng-ust-java-agent/jni/Makefile
 	liblttng-ust-java-agent/jni/jul/Makefile
 	liblttng-ust-java-agent/jni/log4j/Makefile
 	liblttng-ust-libc-wrapper/Makefile
 	liblttng-ust-cyg-profile/Makefile
 	liblttng-ust-python-agent/Makefile
+	liblttng-ust-python-agent/setup.py
+	liblttng-ust-python-agent/lttngust/__init__.py
 	tools/Makefile
 	tests/Makefile
 	tests/hello/Makefile
@@ -398,6 +407,14 @@ AC_CONFIG_FILES([
 	lttng-ust.pc
 ])
 
+# Create link for python agent for the VPATH guru.
+AC_CONFIG_LINKS([
+	liblttng-ust-python-agent/lttngust/agent.py:liblttng-ust-python-agent/lttngust/agent.py
+	liblttng-ust-python-agent/lttngust/cmd.py:liblttng-ust-python-agent/lttngust/cmd.py
+	liblttng-ust-python-agent/lttngust/debug.py:liblttng-ust-python-agent/lttngust/debug.py
+	liblttng-ust-python-agent/lttngust/loghandler.py:liblttng-ust-python-agent/lttngust/loghandler.py
+])
+
 AC_OUTPUT
 
 AS_ECHO()
@@ -419,7 +436,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: ")