Get Blackdown support to compile. Doesn't seem to be able to find

classes yet...

It looks like the current Sun JDK 1.2.2 won't be able to be supported.
Green_threads don't work with JVM Initialization, and Sun doesn't support
native_threads yet...

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index cf07914142b79d98b1985b4bca58148f46c6e4eb..7e390703b62b6e8d2ceb442a161fefd27b2993c7 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -48,25 +48,30 @@ AC_ARG_WITH(java,
       done
 
     else
+
+      for i in `find $withval/include -type d`; do
+       test -f $i/jni.h && JAVA_INCLUDE="-I$i"
+       test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
+      done
+
       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)
+         test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
        fi
       done
+
       if test -z "$JAVA_INCLUDE"; then
        AC_MSG_RESULT(no)
        AC_MSG_ERROR(unable to find Java VM libraries)
       fi
+
+      JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
       AC_ADD_LIBRARY(java)
     fi
 

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index cf07914142b79d98b1985b4bca58148f46c6e4eb..7e390703b62b6e8d2ceb442a161fefd27b2993c7 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -48,25 +48,30 @@ AC_ARG_WITH(java,
       done
 
     else
+
+      for i in `find $withval/include -type d`; do
+       test -f $i/jni.h && JAVA_INCLUDE="-I$i"
+       test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
+      done
+
       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)
+         test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
        fi
       done
+
       if test -z "$JAVA_INCLUDE"; then
        AC_MSG_RESULT(no)
        AC_MSG_ERROR(unable to find Java VM libraries)
       fi
+
+      JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
       AC_ADD_LIBRARY(java)
     fi