Author: jfclere
Date: Thu Mar 30 14:20:25 2006
New Revision: 390259
URL: http://svn.apache.org/viewcvs?rev=390259&view=rev
Log:
Improve the detection of SableVM (now Ok on debian).
Modified:
jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4?rev=390259&r1=390258&r2=390259&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
(original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4 Thu
Mar 30 14:20:25 2006
@@ -39,11 +39,16 @@
AC_DEFUN([AP_PROG_JAVAC],[
if test "$SABLEVM" != "NONE"
then
- AC_PATH_PROG(JAVAC,javac-sablevm,NONE,$JAVA_HOME/bin)
- else
+ AC_PATH_PROG(JAVACSABLE,javac-sablevm,NONE,$JAVA_HOME/bin)
+ fi
+ if test "$JAVACSABLE" = "NONE"
+ then
XPATH="$JAVA_HOME/bin:$PATH"
AC_PATH_PROG(JAVAC,javac,NONE,$XPATH)
+ else
+ AC_PATH_PROG(JAVAC,javac-sablevm,NONE,$JAVA_HOME/bin)
fi
+ AC_MSG_RESULT([$JAVAC])
if test "$JAVAC" = "NONE"
then
AC_MSG_ERROR([javac not found])
@@ -58,10 +63,14 @@
AC_DEFUN([AP_PROG_JAR],[
if test "$SABLEVM" != "NONE"
then
- AC_PATH_PROG(JAR,jar-sablevm,NONE,$JAVA_HOME/bin)
- else
+ AC_PATH_PROG(JARSABLE,jar-sablevm,NONE,$JAVA_HOME/bin)
+ fi
+ if test "$JARSABLE" = "NONE"
+ then
XPATH="$JAVA_HOME/bin:$PATH"
AC_PATH_PROG(JAR,jar,NONE,$XPATH)
+ else
+ AC_PATH_PROG(JAR,jar-sablevm,NONE,$JAVA_HOME/bin)
fi
if test "$JAR" = "NONE"
then
@@ -96,6 +105,14 @@
if test x"$JAVA_HOME" != x
then
AC_PATH_PROG(SABLEVM,sablevm,NONE,$JAVA_HOME/bin)
+ if test "$SABLEVM" = "NONE"
+ then
+ dnl java may be SableVM.
+ if $JAVA_HOME/bin/java -version 2> /dev/null | grep SableVM > /dev/null
+ then
+ SABLEVM=$JAVA_HOME/bin/java
+ fi
+ fi
if test "$SABLEVM" != "NONE"
then
AC_MSG_RESULT([Using sableVM: $SABLEVM])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
