Java module now works with Linux jdk 1.2pre2.

diff --git a/ext/java/README b/ext/java/README
index d873fe75a2734c78048fda5d7c7a482739d4e5a8..1bc43600e4896ab045ec02edf782179ae7232dba 100644 (file)
--- a/ext/java/README
+++ b/ext/java/README
@@ -101,6 +101,28 @@ php.ini:
    extension_dir=/home/rubys/php4/modules
    extension=libphp_java.so
 
+========================================================================
+===     JVM=Sun/Blackdown 1.2pre-release-v2, OS=Linux (glibc 2.1)    ===
+========================================================================
+
+build instructions:
+
+   ./configure --with-java=/usr/local/lib/jdk1.2
+
+php.ini:
+
+   [java]
+   java.library=/usr/local/lib/jdk1.2/jre/lib/i386/libjava.so
+   java.library.path=/usr/local/lib/jdk1.2/jre/lib/i386/classic:/usr/local/lib/jdk1.2/jre/lib/i386/native_threads:/usr/local/lib/jdk1.2/jre/lib/i386:/var/tmp/work/php4/modules
+   java.class.path=/usr/local/lib/jdk1.2/jre/lib/rt.jar:/usr/local/lib/jdk1.2/jre/lib/i18n.jar:/var/tmp/work/php4/modules/php_java.jar
+   extension_dir=/var/tmp/work/php4/modules
+   extension=libphp_java.so
+
+You may also have to adapt your LD_LIBRARY_PATH environment variable,
+if you didn't add the jdk library paths to /etc/ld.so.conf :
+
+LD_LIBRARY_PATH="/usr/local/lib/jdk1.2/jre/lib/i386:/usr/local/lib/jdk1.2/jre/lib/i386/classic:/usr/local/lib/jdk1.2/jre/lib/i386/native_threads:$LD_LIBRARY_PATH"
+
 ========================================================================
 ===                JVM=Sun JDK 1.1.8, OS=Windows NT 4                ===
 ========================================================================

diff --git a/ext/java/java.c b/ext/java/java.c
index 2c2aee1a9ad04586dcb4bf75df6c6febce7c027b..73c555c8b85060dea3e4a639a5f5bdeac4334e5e 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -159,7 +159,7 @@ static int jvm_create() {
 #ifdef JNI_12
 
   vm_args.version = JNI_VERSION_1_2;
-  vm_args.ignoreUnrecognized = FALSE;
+  vm_args.ignoreUnrecognized = JNI_FALSE;
   vm_args.options = options;
   vm_args.nOptions = 0;
 

diff --git a/ext/rpc/java/README b/ext/rpc/java/README
index d873fe75a2734c78048fda5d7c7a482739d4e5a8..1bc43600e4896ab045ec02edf782179ae7232dba 100644 (file)
--- a/ext/rpc/java/README
+++ b/ext/rpc/java/README
@@ -101,6 +101,28 @@ php.ini:
    extension_dir=/home/rubys/php4/modules
    extension=libphp_java.so
 
+========================================================================
+===     JVM=Sun/Blackdown 1.2pre-release-v2, OS=Linux (glibc 2.1)    ===
+========================================================================
+
+build instructions:
+
+   ./configure --with-java=/usr/local/lib/jdk1.2
+
+php.ini:
+
+   [java]
+   java.library=/usr/local/lib/jdk1.2/jre/lib/i386/libjava.so
+   java.library.path=/usr/local/lib/jdk1.2/jre/lib/i386/classic:/usr/local/lib/jdk1.2/jre/lib/i386/native_threads:/usr/local/lib/jdk1.2/jre/lib/i386:/var/tmp/work/php4/modules
+   java.class.path=/usr/local/lib/jdk1.2/jre/lib/rt.jar:/usr/local/lib/jdk1.2/jre/lib/i18n.jar:/var/tmp/work/php4/modules/php_java.jar
+   extension_dir=/var/tmp/work/php4/modules
+   extension=libphp_java.so
+
+You may also have to adapt your LD_LIBRARY_PATH environment variable,
+if you didn't add the jdk library paths to /etc/ld.so.conf :
+
+LD_LIBRARY_PATH="/usr/local/lib/jdk1.2/jre/lib/i386:/usr/local/lib/jdk1.2/jre/lib/i386/classic:/usr/local/lib/jdk1.2/jre/lib/i386/native_threads:$LD_LIBRARY_PATH"
+
 ========================================================================
 ===                JVM=Sun JDK 1.1.8, OS=Windows NT 4                ===
 ========================================================================

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 2c2aee1a9ad04586dcb4bf75df6c6febce7c027b..73c555c8b85060dea3e4a639a5f5bdeac4334e5e 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -159,7 +159,7 @@ static int jvm_create() {
 #ifdef JNI_12
 
   vm_args.version = JNI_VERSION_1_2;
-  vm_args.ignoreUnrecognized = FALSE;
+  vm_args.ignoreUnrecognized = JNI_FALSE;
   vm_args.options = options;
   vm_args.nOptions = 0;