Author: jfclere
Date: Thu Sep 20 13:36:05 2007
New Revision: 577909
URL: http://svn.apache.org/viewvc?rev=577909&view=rev
Log:
Add support of J9VM based JVM.
Modified:
tomcat/connectors/trunk/jni/native/build/tcnative.m4
tomcat/connectors/trunk/jni/native/configure.in
Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?rev=577909&r1=577908&r2=577909&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original)
+++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Thu Sep 20 13:36:05
2007
@@ -239,6 +239,21 @@
then
AC_MSG_RESULT([Using sableVM: $SABLEVM])
CFLAGS="$CFLAGS -DHAVE_SABLEVM"
+ NEED_JNI_MD=no
+ fi
+ fi
+ ])
+dnl check for IBM J9VM
+AC_DEFUN(
+ [TCN_J9VM],
+ [
+ if test x"$JAVA_HOME" != x
+ then
+ J9VM=`$JAVA_HOME/bin/java -version 2>&1 | grep J9VM`
+ if test x"$J9VM" != x
+ then
+ AC_MSG_RESULT([Using J9VM: $J9VM])
+ NEED_JNI_MD=no
fi
fi
])
Modified: tomcat/connectors/trunk/jni/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/configure.in?rev=577909&r1=577908&r2=577909&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Thu Sep 20 13:36:05 2007
@@ -106,8 +106,10 @@
dnl
dnl Find the JVM related information
dnl
+NEED_JNI_MD=yes
TCN_FIND_JDK
TCN_SABLEVM
+TCN_J9VM
dnl MAC OS X does not used include but Headers
if test -d ${JAVA_HOME}/Headers; then
@@ -118,7 +120,7 @@
APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC])
dnl sableVM does not have/need $JAVA_OS/jni_md.h
-if test "$SABLEVM" = "NONE"; then
+if test "$NEED_JNI_MD" = "yes"; then
TCN_FIND_JDK_OS
if test -z "${JAVA_OS}"; then
AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
