X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=9002159344b3bc089ed81b70fbcc5815157c2f87;hb=636c5aa4d9b6b58e291aa4c18f791cd39089724b;hp=9926d7329320dfd3d67c71550e21b6a15168e44a;hpb=67c5b804ac870bdc3b262c0cf6cbf117f3e6bc1e;p=ust.git

diff --git a/configure.ac b/configure.ac
index 9926d73..9002159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,13 +135,43 @@ if test x$NO_UNALIGNED_ACCESS = x ; then
 AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
 fi
 
+# Set compile flags to java include files if given
+AC_ARG_WITH(java_jdk, [  --with-java-jdk=DIR     use java jdk from DIR. Ex : $JAVA_HOME.], JAVA_SDK=$withval,)
+if test $JAVA_SDK; then
+        if test -d $JAVA_SDK; then
+                AC_MSG_RESULT([using java include in $JAVA_SDK])
+                SUBDIRS=`find $JAVA_SDK/include -type d`
+		CFLAGS+=" "
+                CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
+		CFLAGS+=" "
+        else
+                AC_MSG_ERROR(Unable to find java include file in $JAVA_JDK)
+        fi
+fi
+
+# Check for JNI header files if requested
+AC_ARG_WITH(jni-interface, [  --with-jni-interface    build JNI interface between C and java. Need java include files.
+			  [[default=no]]])
+
+if test -z "$with_jni_interface"; then
+        with_jni_interface=${with_jni_interface_default-no}
+fi
+
+if test "$with_jni_interface" = "yes"; then
+        AC_CHECK_HEADERS([jni.h],,AC_MSG_ERROR([
+missing jni.h
+Make sure Sun Java or OpenJDK or GCJ is installed and that this header file exists in the system path.
+Use --with-java-jdk=DIR flag to point to your java include files or desactivate the JNI interface.]))
+fi
+AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
 	doc/man/Makefile
 	doc/info/Makefile
 	include/Makefile
-	liblttng-sessiond-comm/Makefile
+	liblttng-ust-comm/Makefile
 	libringbuffer/Makefile
 	libust/Makefile
 	tests/Makefile
@@ -167,5 +197,6 @@ AC_CONFIG_FILES([
 	snprintf/Makefile
 	ust.pc
 	include/ust/version.h
+	libustjava/Makefile
 ])
 AC_OUTPUT