]> granicus.if.org Git - php/commitdiff
Fixed the build issues reported by Stas.
authorfoobar <sniper@php.net>
Sun, 31 Mar 2002 15:41:24 +0000 (15:41 +0000)
committerfoobar <sniper@php.net>
Sun, 31 Mar 2002 15:41:24 +0000 (15:41 +0000)
ext/java/Makefile.frag [new file with mode: 0644]
ext/java/Makefile.in [deleted file]
ext/java/config.m4
ext/rpc/Makefile.in [deleted file]
ext/rpc/java/Makefile.frag [new file with mode: 0644]
ext/rpc/java/Makefile.in [deleted file]
ext/rpc/java/config.m4

diff --git a/ext/java/Makefile.frag b/ext/java/Makefile.frag
new file mode 100644 (file)
index 0000000..1813ec8
--- /dev/null
@@ -0,0 +1,13 @@
+
+$(srcdir)/java.c : $(srcdir)/php_java.jar
+
+$(srcdir)/php_java.jar : $(srcdir)/reflect.java
+       $(mkinstalldirs) $(srcdir)/net/php
+       @cp $(srcdir)/reflect.java $(srcdir)/net/php
+       @echo library=php_java > $(srcdir)/net/php/reflect.properties
+       javac $(srcdir)/net/php/reflect.java
+       @test ! -f reflect.class || mv reflect.class $(srcdir)/net/php # bug in KJC javac
+       $(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties
+       @rm $(srcdir)/net/php/reflect.*
+       @rmdir $(srcdir)/net/php
+       @rmdir $(srcdir)/net
diff --git a/ext/java/Makefile.in b/ext/java/Makefile.in
deleted file mode 100644 (file)
index 2a98015..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-LTLIBRARY_SHARED_NAME  = libphp_java.la
-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)
-
-make_shared = yes
-
-include $(top_srcdir)/build/dynlib.mk
-
-php_java.jar : reflect.java
-       $(mkinstalldirs) net/php
-       @cp $(srcdir)/reflect.java net/php
-       @echo library=php_java>net/php/reflect.properties
-       javac net/php/reflect.java
-       @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
-       $(JAVA_JAR) php_java.jar net/php/*.class net/php/*.properties
-       @rm net/php/reflect.*
-       @rmdir net/php
-       @rmdir net
index 9fe8e754374aec5fd36643ccda1c9ae9ca4386eb..604959f7e048467c1e62450c15bb19020b8430f4 100644 (file)
@@ -2,120 +2,114 @@ dnl
 dnl $Id$
 dnl
 
-AC_MSG_CHECKING(for Java support)
-AC_ARG_WITH(java,
+PHP_ARG_WITH(java, for JAVA support,
 [  --with-java[=DIR]       Include Java support. DIR is the JDK base install directory. 
-                          This extension is always built as shared.],
-[
-  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"
-    else
-      JAVA_JAR='zip -q0'
-    fi
+                          This extension is always built as shared.])
 
-    if test "$withval" = "yes"; then
-      withval=`cd \`dirname \\\`which javac\\\`\`/..;pwd`
-    fi
+if test "$PHP_JAVA" != "no"; then
 
-    if test -d $withval/lib/kaffe; then
-      PHP_ADD_LIBPATH($withval/lib)
+  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  
 
-      JAVA_CFLAGS=-DKAFFE
-      JAVA_INCLUDE=-I$withval/include/kaffe
-      JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar
-      JAVA_LIB=kaffevm
-      JAVA_LIBPATH=$withval/lib/kaffe
-      java_libext=kaffevm
+  # 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"
+  else
+    JAVA_JAR='zip -q0'
+  fi
 
-      test -f $withval/lib/$JAVA_LIB && JAVA_LIBPATH=$withval/lib
-      test -f $withval/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$withval/lib/kaffe
+  if test "$PHP_JAVA" = "yes"; then
+    PHP_JAVA=`cd \`dirname \\\`which javac\\\`\`/..;pwd`
+  fi
 
-      # 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'
-      fi
+  if test -d $PHP_JAVA/lib/kaffe; then
+    PHP_ADD_LIBPATH($PHP_JAVA/lib)
+    JAVA_CFLAGS=-DKAFFE
+    JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
+    JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
+    JAVA_LIB=kaffevm
+    JAVA_LIBPATH=$PHP_JAVA/lib/kaffe
+    java_libext=kaffevm
 
-    elif test -f $withval/lib/$java_libext; then
-      JAVA_LIB=java
-      JAVA_LIBPATH=$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
-
-      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/classes.zip && JAVA_CFLAGS=-DJNI_11
-        test -f $i/rt.jar      && JAVA_CFLAGS=-DJNI_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/$java_libext; then 
-          JAVA_LIB=java
-          JAVA_LIBPATH=$i
-          test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
-          test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
-          test -d $i/server && PHP_ADD_LIBPATH($i/server)
-          test -d $i/native_threads && PHP_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
+    test -f $PHP_JAVA/lib/$JAVA_LIB       && JAVA_LIBPATH=$PHP_JAVA/lib
+    test -f $PHP_JAVA/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/lib/kaffe
 
-      JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
+    # 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'
     fi
 
-    AC_DEFINE(HAVE_JAVA,1,[ ])
-    if test -z "$JAVA_LIBPATH"; then
+  elif test -f $PHP_JAVA/lib/$java_libext; then
+    JAVA_LIB=java
+    JAVA_LIBPATH=$PHP_JAVA/lib
+    JAVA_INCLUDE=-I$PHP_JAVA/include
+    test -f $PHP_JAVA/lib/classes.zip && JAVA_CFLAGS=-DJNI_11
+    test -f $PHP_JAVA/lib/jvm.jar     && JAVA_CFLAGS=-DJNI_12
+    test -f $PHP_JAVA/lib/classes.zip && JAVA_CLASSPATH=$PHP_JAVA/lib/classes.zip
+    test -f $PHP_JAVA/lib/jvm.jar     && JAVA_CLASSPATH=$PHP_JAVA/lib/jvm.jar
+
+    for i in $PHP_JAVA/include/*; do
+      test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
+    done
+
+  else
+
+    for i in `find $PHP_JAVA/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 $PHP_JAVA/. -type d`; do
+      test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
+      test -f $i/rt.jar      && JAVA_CFLAGS=-DJNI_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/$java_libext; then 
+        JAVA_LIB=java
+        JAVA_LIBPATH=$i
+        test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
+        test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
+        test -d $i/server  && PHP_ADD_LIBPATH($i/server)
+        test -d $i/native_threads && PHP_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
-    PHP_ADD_LIBPATH($JAVA_LIBPATH)
-    JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
 
-    if test "$PHP_SAPI" != "servlet"; then
-      PHP_EXTENSION(java, shared)
+    JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
+  fi
+
+  AC_DEFINE(HAVE_JAVA,1,[ ])
 
-      if test "$PHP_SAPI" = "cgi"; then
-        PHP_ADD_LIBRARY($JAVA_LIB)
-      fi
+  if test -z "$JAVA_LIBPATH"; then
+    AC_MSG_ERROR(unable to find Java VM libraries)
+  fi
 
-      INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
-      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
+  PHP_ADD_LIBPATH($JAVA_LIBPATH)
+  JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
+
+  if test "$PHP_SAPI" != "servlet"; then
+    PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE)
+
+    if test "$PHP_SAPI" = "cgi"; then
+      PHP_ADD_LIBRARY($JAVA_LIB)
     fi
 
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
+    INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
   fi
-],[
-  AC_MSG_RESULT(no)
-])
-
-PHP_SUBST(JAVA_CFLAGS)
-PHP_SUBST(JAVA_CLASSPATH)
-PHP_SUBST(JAVA_INCLUDE)
-PHP_SUBST(JAVA_SHARED)
-PHP_SUBST(JAVA_JAR)
+
+  PHP_SUBST(JAVA_CLASSPATH)
+  PHP_SUBST(JAVA_JAR)
+
+  PHP_ADD_MAKEFILE_FRAGMENT
+fi
+
diff --git a/ext/rpc/Makefile.in b/ext/rpc/Makefile.in
deleted file mode 100644 (file)
index 2a98015..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-LTLIBRARY_SHARED_NAME  = libphp_java.la
-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)
-
-make_shared = yes
-
-include $(top_srcdir)/build/dynlib.mk
-
-php_java.jar : reflect.java
-       $(mkinstalldirs) net/php
-       @cp $(srcdir)/reflect.java net/php
-       @echo library=php_java>net/php/reflect.properties
-       javac net/php/reflect.java
-       @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
-       $(JAVA_JAR) php_java.jar net/php/*.class net/php/*.properties
-       @rm net/php/reflect.*
-       @rmdir net/php
-       @rmdir net
diff --git a/ext/rpc/java/Makefile.frag b/ext/rpc/java/Makefile.frag
new file mode 100644 (file)
index 0000000..1813ec8
--- /dev/null
@@ -0,0 +1,13 @@
+
+$(srcdir)/java.c : $(srcdir)/php_java.jar
+
+$(srcdir)/php_java.jar : $(srcdir)/reflect.java
+       $(mkinstalldirs) $(srcdir)/net/php
+       @cp $(srcdir)/reflect.java $(srcdir)/net/php
+       @echo library=php_java > $(srcdir)/net/php/reflect.properties
+       javac $(srcdir)/net/php/reflect.java
+       @test ! -f reflect.class || mv reflect.class $(srcdir)/net/php # bug in KJC javac
+       $(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties
+       @rm $(srcdir)/net/php/reflect.*
+       @rmdir $(srcdir)/net/php
+       @rmdir $(srcdir)/net
diff --git a/ext/rpc/java/Makefile.in b/ext/rpc/java/Makefile.in
deleted file mode 100644 (file)
index 2a98015..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-LTLIBRARY_SHARED_NAME  = libphp_java.la
-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)
-
-make_shared = yes
-
-include $(top_srcdir)/build/dynlib.mk
-
-php_java.jar : reflect.java
-       $(mkinstalldirs) net/php
-       @cp $(srcdir)/reflect.java net/php
-       @echo library=php_java>net/php/reflect.properties
-       javac net/php/reflect.java
-       @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
-       $(JAVA_JAR) php_java.jar net/php/*.class net/php/*.properties
-       @rm net/php/reflect.*
-       @rmdir net/php
-       @rmdir net
index 9fe8e754374aec5fd36643ccda1c9ae9ca4386eb..604959f7e048467c1e62450c15bb19020b8430f4 100644 (file)
@@ -2,120 +2,114 @@ dnl
 dnl $Id$
 dnl
 
-AC_MSG_CHECKING(for Java support)
-AC_ARG_WITH(java,
+PHP_ARG_WITH(java, for JAVA support,
 [  --with-java[=DIR]       Include Java support. DIR is the JDK base install directory. 
-                          This extension is always built as shared.],
-[
-  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"
-    else
-      JAVA_JAR='zip -q0'
-    fi
+                          This extension is always built as shared.])
 
-    if test "$withval" = "yes"; then
-      withval=`cd \`dirname \\\`which javac\\\`\`/..;pwd`
-    fi
+if test "$PHP_JAVA" != "no"; then
 
-    if test -d $withval/lib/kaffe; then
-      PHP_ADD_LIBPATH($withval/lib)
+  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  
 
-      JAVA_CFLAGS=-DKAFFE
-      JAVA_INCLUDE=-I$withval/include/kaffe
-      JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar
-      JAVA_LIB=kaffevm
-      JAVA_LIBPATH=$withval/lib/kaffe
-      java_libext=kaffevm
+  # 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"
+  else
+    JAVA_JAR='zip -q0'
+  fi
 
-      test -f $withval/lib/$JAVA_LIB && JAVA_LIBPATH=$withval/lib
-      test -f $withval/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$withval/lib/kaffe
+  if test "$PHP_JAVA" = "yes"; then
+    PHP_JAVA=`cd \`dirname \\\`which javac\\\`\`/..;pwd`
+  fi
 
-      # 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'
-      fi
+  if test -d $PHP_JAVA/lib/kaffe; then
+    PHP_ADD_LIBPATH($PHP_JAVA/lib)
+    JAVA_CFLAGS=-DKAFFE
+    JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
+    JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
+    JAVA_LIB=kaffevm
+    JAVA_LIBPATH=$PHP_JAVA/lib/kaffe
+    java_libext=kaffevm
 
-    elif test -f $withval/lib/$java_libext; then
-      JAVA_LIB=java
-      JAVA_LIBPATH=$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
-
-      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/classes.zip && JAVA_CFLAGS=-DJNI_11
-        test -f $i/rt.jar      && JAVA_CFLAGS=-DJNI_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/$java_libext; then 
-          JAVA_LIB=java
-          JAVA_LIBPATH=$i
-          test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
-          test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
-          test -d $i/server && PHP_ADD_LIBPATH($i/server)
-          test -d $i/native_threads && PHP_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
+    test -f $PHP_JAVA/lib/$JAVA_LIB       && JAVA_LIBPATH=$PHP_JAVA/lib
+    test -f $PHP_JAVA/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/lib/kaffe
 
-      JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
+    # 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'
     fi
 
-    AC_DEFINE(HAVE_JAVA,1,[ ])
-    if test -z "$JAVA_LIBPATH"; then
+  elif test -f $PHP_JAVA/lib/$java_libext; then
+    JAVA_LIB=java
+    JAVA_LIBPATH=$PHP_JAVA/lib
+    JAVA_INCLUDE=-I$PHP_JAVA/include
+    test -f $PHP_JAVA/lib/classes.zip && JAVA_CFLAGS=-DJNI_11
+    test -f $PHP_JAVA/lib/jvm.jar     && JAVA_CFLAGS=-DJNI_12
+    test -f $PHP_JAVA/lib/classes.zip && JAVA_CLASSPATH=$PHP_JAVA/lib/classes.zip
+    test -f $PHP_JAVA/lib/jvm.jar     && JAVA_CLASSPATH=$PHP_JAVA/lib/jvm.jar
+
+    for i in $PHP_JAVA/include/*; do
+      test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
+    done
+
+  else
+
+    for i in `find $PHP_JAVA/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 $PHP_JAVA/. -type d`; do
+      test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
+      test -f $i/rt.jar      && JAVA_CFLAGS=-DJNI_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/$java_libext; then 
+        JAVA_LIB=java
+        JAVA_LIBPATH=$i
+        test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
+        test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
+        test -d $i/server  && PHP_ADD_LIBPATH($i/server)
+        test -d $i/native_threads && PHP_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
-    PHP_ADD_LIBPATH($JAVA_LIBPATH)
-    JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
 
-    if test "$PHP_SAPI" != "servlet"; then
-      PHP_EXTENSION(java, shared)
+    JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
+  fi
+
+  AC_DEFINE(HAVE_JAVA,1,[ ])
 
-      if test "$PHP_SAPI" = "cgi"; then
-        PHP_ADD_LIBRARY($JAVA_LIB)
-      fi
+  if test -z "$JAVA_LIBPATH"; then
+    AC_MSG_ERROR(unable to find Java VM libraries)
+  fi
 
-      INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
-      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
+  PHP_ADD_LIBPATH($JAVA_LIBPATH)
+  JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
+
+  if test "$PHP_SAPI" != "servlet"; then
+    PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE)
+
+    if test "$PHP_SAPI" = "cgi"; then
+      PHP_ADD_LIBRARY($JAVA_LIB)
     fi
 
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
+    INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
   fi
-],[
-  AC_MSG_RESULT(no)
-])
-
-PHP_SUBST(JAVA_CFLAGS)
-PHP_SUBST(JAVA_CLASSPATH)
-PHP_SUBST(JAVA_INCLUDE)
-PHP_SUBST(JAVA_SHARED)
-PHP_SUBST(JAVA_JAR)
+
+  PHP_SUBST(JAVA_CLASSPATH)
+  PHP_SUBST(JAVA_JAR)
+
+  PHP_ADD_MAKEFILE_FRAGMENT
+fi
+