From: Alexandre Montplaisir Date: Wed, 8 Feb 2012 21:34:49 +0000 (-0500) Subject: Remove the --with-java-dir configure option X-Git-Tag: v1.5-beta1~97 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=be32e4b2bc75e7937ef3841e6c9b6b88aaf237ec;p=lttv.git Remove the --with-java-dir configure option This can be easily specified using CFLAGS, so alleviate the maintenance burden by keeping it out of LTTV's own configuration. Signed-off-by: Alexandre Montplaisir Signed-off-by: Yannick Brosseau --- diff --git a/configure.ac b/configure.ac index 416cd861..31655949 100644 --- a/configure.ac +++ b/configure.ac @@ -95,26 +95,6 @@ AS_IF([test "x$with_trace_sync" = "xyes"],[ AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h pthread.h]) -# Set compile flags to java include files if given -AC_ARG_WITH([java-jdk], - AS_HELP_STRING([--with-java-jdk=DIR], - [use java jdk from DIR. Ex : $JAVA_HOME.]), - [JAVA_SDK=$withval], - []) - -AS_IF([test $JAVA_SDK],[ - AS_IF([test -d $JAVA_SDK],[ - 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+=" " - ],[ - AC_MSG_ERROR([Unable to find Java include files in $JAVA_JDK]) - ]) -]) - - # Check for JNI header files if requested AC_ARG_WITH(jni-interface, AS_HELP_STRING([--with-jni-interface], @@ -125,7 +105,7 @@ AC_ARG_WITH(jni-interface, AS_IF([test "x$with_jni_interface" = "xyes"],[ 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 deactivate the JNI interface.])) +Use CFLAGS=-I/path/ to specify a non-standard path or disable the JNI interface.])) ]) AM_CONDITIONAL([BUILD_JNI_INTERFACE], [ test "$with_jni_interface" = "yes" ] )