tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r801544 - /tomcat/connectors/trunk/jni/native/build/tcnative.m4
Date Thu, 06 Aug 2009 08:50:47 GMT
Author: jfclere
Date: Thu Aug  6 08:50:47 2009
New Revision: 801544

URL: http://svn.apache.org/viewvc?rev=801544&view=rev
Log:
Add detection of the macosx jvm.

Modified:
    tomcat/connectors/trunk/jni/native/build/tcnative.m4

Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?rev=801544&r1=801543&r2=801544&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original)
+++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Thu Aug  6 08:50:47 2009
@@ -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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message