X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=24ef9d35c6a498abda1e556c3d14ce5ef99c5810;hb=36860b656f3e4fb634d0eef500539930ca389c09;hp=6e62fe67972d4bfd89a2a048fe0d9c493fdceaf7;hpb=1a94cf835c07682e9be3081a6445a83cf5b01843;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 6e62fe67..24ef9d35 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.0.1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.0.3],[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
@@ -197,22 +197,6 @@ AS_IF([test $JAVA_JDK],[
         ])
 ])
 
-# Check for JNI header files if requested
-AC_ARG_WITH([jni-interface],
-	[AS_HELP_STRING([--with-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])],
-	[jni_interface=$withval],
-	[jni_interface=no]
-)
-
-AS_IF([test "x$jni_interface" = "xyes"],[
-        AC_CHECK_HEADERS([jni.h],[],[
-        AC_MSG_ERROR([missing jni.h
-Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path.
-Use the --with-java-jdk=DIR flag to point to your Java include files, or disable the JNI interface.])
-	])
-])
-AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
-
 # sdt.h integration
 AC_ARG_WITH([sdt],
 	[AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])],
@@ -255,6 +239,8 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 	#tests/exit-fast/Makefile
 	#tests/basic_long/Makefile
 
+#	liblttng-ust-java/Makefile
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -267,7 +253,6 @@ AC_CONFIG_FILES([
 	liblttng-ust/Makefile
 	liblttng-ust-ctl/Makefile
 	liblttng-ust-fork/Makefile
-	liblttng-ust-java/Makefile
 	liblttng-ust-libc-wrapper/Makefile
 	tools/Makefile
 	tests/Makefile
@@ -293,9 +278,6 @@ AS_ECHO("LTTng-UST will be built with the following options:")
 AS_ECHO("Library format: $LIBFORMAT")
 
 AS_ECHO()
-AS_ECHO_N("Java support (JNI): ")
-AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
-
 AS_ECHO_N("sdt.h integration:  ")
 AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])