Fix: lttng-gen-tp to build out of tree

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a59e8ce8449dc458b9a4d6b51ae404df3b41296b..60460da5710800504778be4f8ceb64133ff25f05 100644 (file)
--- 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.3.0-rc1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.4.0-rc1],[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
@@ -39,8 +39,8 @@ 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="Dominus Vobiscum"
-version_description="A very succulent line-up of beers brewed at Microbrasserie Charlevoix. Elaborated starting from special malts and fermented with a Belgian yeast. These beers are refermented in bottle and will make you discover the richness of wheat, amber and triple styles."
+version_name="Époque Opaque"
+version_description="The Époque Opaque is a black IPA from Trou du Diable brewery. The nose is eerily reminiscent of the coffee crisp candy from of our childhood. These strong mocha accents are present on the palate, which are quickly subdued by Japanese and Australian hops leading to a final state of satisfaction enjoyable for any fan of bitter beer."
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
@@ -209,6 +209,9 @@ AC_ARG_WITH([java-jdk],
        [JAVA_JDK=$withval],
        [JAVA_JDK=""]
 )
+AM_CONDITIONAL([HAVE_JAVA_JDK], [test $JAVA_JDK], [Java JDK path])
+AC_SUBST([JAVA_JDK])
+
 AS_IF([test $JAVA_JDK],[
        AS_IF([test -d $JAVA_JDK],[
                 AC_MSG_RESULT([using Java includes in $JAVA_SDK])
@@ -262,6 +265,17 @@ AS_IF([test "x$with_sdt" = "xyes"],[
        ])
 ])
 
+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".]),
+       [lttng_system_rundir="$withval"],
+       [lttng_system_rundir="/var/run/lttng"])
+AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
+       [LTTng system runtime directory])
+
+lttnglibjavadir="${libdir}/lttng/java"
+AC_SUBST(lttnglibjavadir)
+
 AC_CONFIG_FILES([
        Makefile
        doc/Makefile
@@ -274,7 +288,10 @@ AC_CONFIG_FILES([
        liblttng-ust/Makefile
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
+       liblttng-ust-baddr/Makefile
+       liblttng-ust-dl/Makefile
        liblttng-ust-java/Makefile
+       liblttng-ust-jul/Makefile
        liblttng-ust-libc-wrapper/Makefile
        liblttng-ust-cyg-profile/Makefile
        tools/Makefile
@@ -285,6 +302,7 @@ AC_CONFIG_FILES([
        tests/snprintf/Makefile
        tests/benchmark/Makefile
        tests/utils/Makefile
+       tests/java-jul/Makefile
        lttng-ust.pc
 ])