X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=c5802ee26af95f4ff4495545c0c4238a26747042;hb=75582b3a56366b73ba1f656e03fc8df4a991ac45;hp=7edbc9f2227e66b9c559246f79daf15e6a9b3d27;hpb=07d2f704d61649a36bbe0dd71d48ea811d301f9d;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 7edbc9f2..c5802ee2 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.3.0-rc2],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.3.0],[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
@@ -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])
@@ -283,6 +286,7 @@ AC_CONFIG_FILES([
 	liblttng-ust-ctl/Makefile
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
+	liblttng-ust-jul/Makefile
 	liblttng-ust-libc-wrapper/Makefile
 	liblttng-ust-cyg-profile/Makefile
 	tools/Makefile
@@ -293,6 +297,7 @@ AC_CONFIG_FILES([
 	tests/snprintf/Makefile
 	tests/benchmark/Makefile
 	tests/utils/Makefile
+	tests/java-jul/Makefile
 	lttng-ust.pc
 ])