Author: rjung
Date: Mon Jan 4 16:50:42 2010
New Revision: 895697
URL: http://svn.apache.org/viewvc?rev=895697&view=rev
Log:
Add detection of the macosx jvm.
Backport of r803803 applied by jfclere.
Was anyone able to test that actually?
Modified:
tomcat/native/branches/1.1.x/native/build/tcnative.m4
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=895697&r1=895696&r2=895697&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Mon Jan 4 16:50:42
2010
@@ -117,13 +117,13 @@
# JAVA_PLATFORM
AC_MSG_CHECKING([Try to guess JDK location])
- for JAVA_PREFIX in /usr/local /usr/local/lib /usr /usr/lib /opt
/usr/java ; do
+ for JAVA_PREFIX in /usr/local /usr/local/lib /usr /usr/lib /opt
/usr/java /System/Library/Frameworks/JavaVM.framework/Versions/ ; do
for JAVA_PLATFORM in 6 5 4 3 2 ; do
- for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 "" ; do
+ for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 .0 "" ; do
- for VARIANT in IBMJava2- java java- jdk jdk-; do
+ for VARIANT in IBMJava2- java java- jdk jdk- ""; do
GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}"
dnl AC_MSG_CHECKING([${GUESS}])
if test -d "${GUESS}/bin" & test -d "${GUESS}/include" ; then
@@ -131,6 +131,11 @@
AC_MSG_RESULT([${GUESS}])
break
fi
+ if test -d "${GUESS}/Commands" & test -d "${GUESS}/Headers" ;
then
+ JAVA_HOME="${GUESS}"
+ AC_MSG_RESULT([${GUESS}])
+ break
+ fi
done
if test -n "${JAVA_HOME}" ; then
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
