cvs: /php4/ext/java Makefile.in config.m4 java.c

rubys Sun Mar 12 17:12:05 2000 EDT Modified files: /php4/ext/java Makefile.in config.m4 java.c Log: Eliminate java.library ini option in favor of rpath Index: php4/ext/java/Makefile.in diff -u php4/ext/java/Makefile.in:1.5 php4/ext/java/Makefile.in:1.6 --- php4/ext/java/Makefile.in:1.5 Fri Feb 18 01:59:41 2000 +++ php4/ext/java/Makefile.in Sun Mar 12 17:11:35 2000 @@ -1,12 +1,15 @@ -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ LTLIBRARY_SHARED_NAME = libphp_java.la -LTLIBRARY_SOURCES = java.c +LTLIBRARY_SOURCES = java.c LTLIBRARY_DEPENDENCIES = php_java.jar + +LTLIBRARY_LDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) +LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) EXTRA_CFLAGS = $(JAVA_CFLAGS) EXTRA_INCLUDES = $(JAVA_INCLUDE) Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.12 php4/ext/java/config.m4:1.13 --- php4/ext/java/config.m4:1.12 Sat Jan 29 09:53:55 2000 +++ php4/ext/java/config.m4 Sun Mar 12 17:11:35 2000 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.12 2000/01/29 17:53:55 rubys Exp $ +# $Id: config.m4,v 1.13 2000/03/13 01:11:35 rubys Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -18,54 +18,65 @@ fi if test "$withval" = "yes"; then - if test -d /usr/local/lib/kaffe; then - JAVA_CFLAGS="-DKAFFE" - JAVA_INCLUDE=-I/usr/local/include/kaffe - JAVA_CLASSPATH=/usr/local/share/kaffe/Klasses.jar - elif test -d /usr/lib/kaffe; then - JAVA_CFLAGS="-DKAFFE" - JAVA_INCLUDE=-I/usr/include/kaffe - JAVA_CLASSPATH=/usr/share/kaffe/Klasses.jar - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(unable to find Java VM libraries) - fi + withval=cd \which javac\/../..;pwd + fi + + if test -d $withval/lib/kaffe; then + AC_ADD_LIBPATH($withval/lib/kaffe) + + JAVA_CFLAGS="-DKAFFE" + JAVA_INCLUDE=-I$withval/include/kaffe + JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar + test -f $withval/lib/libkaffevm.so && AC_ADD_LIBPATH($withval/lib) + AC_ADD_LIBRARY(kaffevm) + # 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' + JAVA_JAR='zip -q0' fi + elif test -f $withval/lib/libjava.so; then + AC_ADD_LIBRARY_WITH_PATH(java, $withval/lib) + JAVA_INCLUDE="-I$withval/include" + test -f $withval/lib/classes.zip && JAVA_CFLAGS="-DJNI_11" + test -f $withval/lib/jvm.jar && JAVA_CFLAGS="-DJNI_12" + test -f $withval/lib/classes.zip && JAVA_CLASSPATH="$withval/lib/classes.zip" + test -f $withval/lib/jvm.jar && JAVA_CLASSPATH="$withval/lib/jvm.jar" + for i in $JAVA_INCLUDE/*; do + test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i" + done + else - if test -f $withval/lib/libjava.so; then - JAVA_INCLUDE="-I$withval/include" - test -f $withval/lib/classes.zip && JAVA_CFLAGS="-DJNI_11" - test -f $withval/lib/jvm.jar && JAVA_CFLAGS="-DJNI_12" - test -f $withval/lib/classes.zip && JAVA_CLASSPATH="$withval/lib/classes.zip" - test -f $withval/lib/jvm.jar && JAVA_CLASSPATH="$withval/lib/jvm.jar" - for i in $JAVA_INCLUDE/*; do - test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i" - done - else - for i in find $withval -type d; do - test -f $i/jni.h && JAVA_INCLUDE="-I$i" - test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" - test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11" - test -f $i/jvm.jar && JAVA_CFLAGS="-DJNI_12" - test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip" - test -f $i/jvm.jar && JAVA_CLASSPATH="$i/jvm.jar" - done - if test -z "$JAVA_INCLUDE"; then - AC_MSG_RESULT(no) - AC_MSG_ERROR(unable to find Java VM libraries) + for i in find $withval -type d; do + test -f $i/jni.h && JAVA_INCLUDE="-I$i" + test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" + test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11" + test -f $i/jvm.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/jvm.jar && JAVA_CLASSPATH="$i/jvm.jar" + test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar" + if test -f $i/libjava.so; then + AC_ADD_LIBPATH($i) + test -d $i/classic && AC_ADD_LIBPATH($i/classic) + test -d $i/green_threads && AC_ADD_LIBPATH($i/green_threads) fi + done + if test -z "$JAVA_INCLUDE"; then + AC_MSG_RESULT(no) + AC_MSG_ERROR(unable to find Java VM libraries) fi + AC_ADD_LIBRARY(java) fi AC_DEFINE(HAVE_JAVA,1,[ ]) if test "$PHP_SAPI" != "servlet"; then PHP_EXTENSION(java, shared) fi + + INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)" + AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.14 php4/ext/java/java.c:1.15 --- php4/ext/java/java.c:1.14 Sun Feb 20 04:09:33 2000 +++ php4/ext/java/java.c Sun Mar 12 17:11:35 2000 @@ -64,7 +64,6 @@ static int le_jobject = 0; -static char *javalib = 0; static char *classpath = 0; static char *libpath = 0; static char *javahome = 0; @@ -88,8 +87,6 @@ NULL, PHP_INI_ALL, OnIniUpdate, &classpath) PHP_INI_ENTRY1("java.home", NULL, PHP_INI_ALL, OnIniUpdate, &javahome) - PHP_INI_ENTRY1("java.library", - NULL, PHP_INI_ALL, OnIniUpdate, &javalib) PHP_INI_ENTRY1("java.library.path", NULL, PHP_INI_ALL, OnIniUpdate, &libpath) PHP_INI_END() @@ -150,13 +147,6 @@ #ifndef PHP_WIN32 if (!libpath) libpath = getenv("LD_LIBRARY_PATH"); - if (javalib) { - javadl = dlopen(javalib, RTLD_GLOBAL | RTLD_LAZY); - if (!javadl) { - php_error(E_ERROR, "Unable to create Java Virtual Machine"); - return -1; - } - } #endif #ifdef JNI_12