You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jf...@apache.org on 2005/09/28 21:01:45 UTC
svn commit: r292258 -
/jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
Author: jfclere
Date: Wed Sep 28 12:01:42 2005
New Revision: 292258
URL: http://svn.apache.org/viewcvs?rev=292258&view=rev
Log:
Arrange the logic for handling sablevm.
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=292258&r1=292257&r2=292258&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 Wed Sep 28 12:01:42 2005
@@ -35,14 +35,14 @@
])
])
-dnl AC_PATH_PROG does not work (it checks first PATH then our parameter).
-dnl so we do 2 checks.
+dnl Check for JAVA compilers.
AC_DEFUN([AP_PROG_JAVAC],[
- AC_PATH_PROG(JAVAC,javac,NONE,$JAVA_HOME/bin)
- if test "$JAVAC" = "NONE"
+ if test "$SABLEVM" != "NONE"
then
- AC_PATH_PROG(JAVAC_PATH,javac,NONE,$PATH)
- JAVAC=$JAVAC_PATH
+ AC_PATH_PROG(JAVAC,javac-sablevm,NONE,$JAVA_HOME/bin)
+ else
+ XPATH="$JAVA_HOME/bin:$PATH"
+ AC_PATH_PROG(JAVAC,javac,NONE,$XPATH)
fi
if test "$JAVAC" = "NONE"
then
@@ -54,12 +54,14 @@
AC_SUBST(JAVACFLAGS)
])
+dnl Check for jar archivers.
AC_DEFUN([AP_PROG_JAR],[
- AC_PATH_PROG(JAR,jar,NONE,$JAVA_HOME/bin)
- if test "$JAR" = "NONE"
+ if test "$SABLEVM" != "NONE"
then
- AC_PATH_PROG(JAR_PATH,jar,NONE,$PATH)
- JAR=$JAR_PATH
+ AC_PATH_PROG(JAR,jar-sablevm,NONE,$JAVA_HOME/bin)
+ else
+ XPATH="$JAVA_HOME/bin:$PATH"
+ AC_PATH_PROG(JAR,jar,NONE,$XPATH)
fi
if test "$JAR" = "NONE"
then
@@ -93,8 +95,6 @@
AC_DEFUN([AP_SABLEVM],[
if test x"$JAVA_HOME" != x
then
- AC_PATH_PROG(JAVAC,javac-sablevm,NONE,$JAVA_HOME/bin)
- AC_PATH_PROG(JAR,jar-sablevm,NONE,$JAVA_HOME/bin)
AC_PATH_PROG(SABLEVM,sablevm,NONE,$JAVA_HOME/bin)
if test "$SABLEVM" != "NONE"
then
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org