akilov Thu Jan 18 10:36:23 2001 EDT
Modified files:
/php4/ext/java config.m4
Log:
Support AIX/HP shared lib extensions and j2sdk1.3.0 (hotspot)
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.21 php4/ext/java/config.m4:1.22
--- php4/ext/java/config.m4:1.21 Mon Dec 18 16:14:57 2000
+++ php4/ext/java/config.m4 Thu Jan 18 10:36:22 2001
@@ -1,4 +1,4 @@
-# $Id: config.m4,v 1.21 2000/12/19 00:14:57 sniper Exp $
+# $Id: config.m4,v 1.22 2001/01/18 18:36:22 akilov Exp $
# config.m4 for extension java
AC_MSG_CHECKING(for Java support)
@@ -10,6 +10,12 @@
if test "$withval" != "no"; then
JAVA_SHARED="libphp_java.la"
+ pltform=`uname -s 2>/dev/null`
+ java_libext="libjava.so"
+ case "$pltform" in
+ AIX) java_libext="libjava.a" ;;
+ HP-UX) java_libext="libjava.sl" ;;
+ esac
# 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"
@@ -29,6 +35,7 @@
JAVA_INCLUDE=-I$withval/include/kaffe
JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar
JAVA_LIB=kaffevm
+ java_libext=kaffevm
test -f $withval/lib/$JAVA_LIB && JAVA_LIBPATH=$withval/lib
test -f $withval/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$withval/lib/kaffe
@@ -38,7 +45,7 @@
JAVA_JAR='zip -q0'
fi
- elif test -f $withval/lib/libjava.so; then
+ elif test -f $withval/lib/$java_libext; then
JAVA_LIB=java
JAVA_LIBPATH=$withval/lib
JAVA_INCLUDE="-I$withval/include"
@@ -63,10 +70,12 @@
test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip"
test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar"
- if test -f $i/libjava.so; then
+ if test -f $i/$java_libext; then
JAVA_LIB=java
JAVA_LIBPATH=$i
+ test -d $i/hotspot && AC_ADD_LIBPATH($i/hotspot)
test -d $i/classic && AC_ADD_LIBPATH($i/classic)
+ test -d $i/server && AC_ADD_LIBPATH($i/server)
test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
fi
done
@@ -81,7 +90,7 @@
AC_DEFINE(HAVE_JAVA,1,[ ])
AC_ADD_LIBPATH($JAVA_LIBPATH)
- JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/lib$JAVA_LIB.so\"'"
+ JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
if test "$PHP_SAPI" != "servlet"; then
PHP_EXTENSION(java, shared)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
