archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wb fix.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

28
ext/java/config.m4
View file

@ -35,7 +35,7 @@ AC_ARG_WITH(java,
# accomodate old versions of kaffe which don't support jar # accomodate old versions of kaffe which don't support jar
if kaffe -version 2>&1 | grep 1.0b > /dev/null; then if kaffe -version 2>&1 | grep 1.0b > /dev/null; then
JAVA_JAR='zip -q0' JAVA_JAR='zip -q0'
fi fi
elif test -f $withval/lib/libjava.so; then elif test -f $withval/lib/libjava.so; then
@ -53,26 +53,27 @@ AC_ARG_WITH(java,
else else
for i in `find $withval/include -type d`; do for i in `find $withval/include -type d`; do
test -f $i/jni.h && JAVA_INCLUDE="-I$i" test -f $i/jni.h && JAVA_INCLUDE="-I$i"
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
done done
for i in `find $withval -type d`; do for i in `find $withval -type d`; do
test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11" test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11"
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
test -d $i/classic && AC_ADD_LIBPATH($i/classic) test -d $i/classic && AC_ADD_LIBPATH($i/classic)
test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads) test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
fi fi
done done
if test -z "$JAVA_INCLUDE"; then if test -z "$JAVA_INCLUDE"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR(unable to find Java VM libraries) AC_MSG_ERROR(unable to find Java VM libraries)
fi fi
JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT" JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
@ -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)

28
ext/rpc/java/config.m4
View file

@ -35,7 +35,7 @@ AC_ARG_WITH(java,
# accomodate old versions of kaffe which don't support jar # accomodate old versions of kaffe which don't support jar
if kaffe -version 2>&1 | grep 1.0b > /dev/null; then if kaffe -version 2>&1 | grep 1.0b > /dev/null; then
JAVA_JAR='zip -q0' JAVA_JAR='zip -q0'
fi fi
elif test -f $withval/lib/libjava.so; then elif test -f $withval/lib/libjava.so; then
@ -53,26 +53,27 @@ AC_ARG_WITH(java,
else else
for i in `find $withval/include -type d`; do for i in `find $withval/include -type d`; do
test -f $i/jni.h && JAVA_INCLUDE="-I$i" test -f $i/jni.h && JAVA_INCLUDE="-I$i"
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
done done
for i in `find $withval -type d`; do for i in `find $withval -type d`; do
test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11" test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11"
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
test -d $i/classic && AC_ADD_LIBPATH($i/classic) test -d $i/classic && AC_ADD_LIBPATH($i/classic)
test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads) test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
fi fi
done done
if test -z "$JAVA_INCLUDE"; then if test -z "$JAVA_INCLUDE"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR(unable to find Java VM libraries) AC_MSG_ERROR(unable to find Java VM libraries)
fi fi
JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT" JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
@ -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)