From: Sam Ruby <rubys@php.net>
Date: Wed, 15 Mar 2000 02:11:27 +0000 (+0000)
Subject: Get Blackdown support to compile.  Doesn't seem to be able to find
X-Git-Tag: PHP-4.0-RC1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cb6e338a188c3df5a69721685dc784f872174dc;p=php

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 cf07914142..7e390703b6 100644
--- 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 cf07914142..7e390703b6 100644
--- 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