This commit is contained in:
foobar 2000-12-19 00:14:58 +00:00
parent c66c250c41
commit 402d60491b
2 changed files with 28 additions and 28 deletions

View file

@ -62,6 +62,7 @@ AC_ARG_WITH(java,
test -f $i/rt.jar && JAVA_CFLAGS="-DJNI_12" test -f $i/rt.jar && JAVA_CFLAGS="-DJNI_12"
test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip" test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip"
test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar" test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar"
if test -f $i/libjava.so; then if test -f $i/libjava.so; then
JAVA_LIB=java JAVA_LIB=java
JAVA_LIBPATH=$i JAVA_LIBPATH=$i
@ -106,4 +107,3 @@ PHP_SUBST(JAVA_CLASSPATH)
PHP_SUBST(JAVA_INCLUDE) PHP_SUBST(JAVA_INCLUDE)
PHP_SUBST(JAVA_SHARED) PHP_SUBST(JAVA_SHARED)
PHP_SUBST(JAVA_JAR) PHP_SUBST(JAVA_JAR)

View file

@ -62,6 +62,7 @@ AC_ARG_WITH(java,
test -f $i/rt.jar && JAVA_CFLAGS="-DJNI_12" test -f $i/rt.jar && JAVA_CFLAGS="-DJNI_12"
test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip" test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip"
test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar" test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar"
if test -f $i/libjava.so; then if test -f $i/libjava.so; then
JAVA_LIB=java JAVA_LIB=java
JAVA_LIBPATH=$i JAVA_LIBPATH=$i
@ -106,4 +107,3 @@ PHP_SUBST(JAVA_CLASSPATH)
PHP_SUBST(JAVA_INCLUDE) PHP_SUBST(JAVA_INCLUDE)
PHP_SUBST(JAVA_SHARED) PHP_SUBST(JAVA_SHARED)
PHP_SUBST(JAVA_JAR) PHP_SUBST(JAVA_JAR)