clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

accomodate old versions of kaffe which don't support jar

Browse Source
This commit is contained in:
Sam Ruby 2000-01-28 10:53:06 +00:00
parent 302ccb0d97
commit 137765c95a
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/java/config.m4
View File

@ -10,6 +10,13 @@ AC_ARG_WITH(java,
if test "$withval" != "no"; then
JAVA_SHARED="libphp_java.la"
# substitute zip for systems which don't have jar in the PATH
if JAVA_JAR=`which jar 2>/dev/null`; then
JAVA_JAR="$JAVA_JAR cf"
else
JAVA_JAR='zip -q0'
fi
if test "$withval" = "yes"; then
if test -d /usr/local/lib/kaffe; then
JAVA_CFLAGS="-DKAFFE"
@ -23,6 +30,12 @@ AC_ARG_WITH(java,
AC_MSG_RESULT(no)
AC_MSG_ERROR(unable to find Java VM libraries)
fi
# accomodate old versions of kaffe which don't support jar
if kaffe -version 2>&1 | grep 1.0b > /dev/null; then
JAVA_JAR='zip -q0'
fi
else
if test -f $withval/lib/libjava.so; then
JAVA_INCLUDE="-I$withval/include"
@ -49,13 +62,6 @@ AC_ARG_WITH(java,
fi
fi
# substitute zip for systems which don't have jar in the PATH
if JAVA_JAR=`which jar 2>/dev/null`; then
JAVA_JAR="$JAVA_JAR cf"
else
JAVA_JAR='zip -q0'
fi
AC_DEFINE(HAVE_JAVA,1,[ ])
PHP_EXTENSION(java, shared)
AC_MSG_RESULT(yes)

20
ext/rpc/java/config.m4
View File

@ -10,6 +10,13 @@ AC_ARG_WITH(java,
if test "$withval" != "no"; then
JAVA_SHARED="libphp_java.la"
# substitute zip for systems which don't have jar in the PATH
if JAVA_JAR=`which jar 2>/dev/null`; then
JAVA_JAR="$JAVA_JAR cf"
else
JAVA_JAR='zip -q0'
fi
if test "$withval" = "yes"; then
if test -d /usr/local/lib/kaffe; then
JAVA_CFLAGS="-DKAFFE"
@ -23,6 +30,12 @@ AC_ARG_WITH(java,
AC_MSG_RESULT(no)
AC_MSG_ERROR(unable to find Java VM libraries)
fi
# accomodate old versions of kaffe which don't support jar
if kaffe -version 2>&1 | grep 1.0b > /dev/null; then
JAVA_JAR='zip -q0'
fi
else
if test -f $withval/lib/libjava.so; then
JAVA_INCLUDE="-I$withval/include"
@ -49,13 +62,6 @@ AC_ARG_WITH(java,
fi
fi
# substitute zip for systems which don't have jar in the PATH
if JAVA_JAR=`which jar 2>/dev/null`; then
JAVA_JAR="$JAVA_JAR cf"
else
JAVA_JAR='zip -q0'
fi
AC_DEFINE(HAVE_JAVA,1,[ ])
PHP_EXTENSION(java, shared)
AC_MSG_RESULT(yes)