php-java-norpath.patch

   1 diff -burN php-4.3.2/ext/java/config.m4 php-4.3.2-java-norpath/ext/java/config.m4
   2 --- php-4.3.2/ext/java/config.m4        Fri Apr  4 19:43:13 2003
   3 +++ php-4.3.2-java-norpath/ext/java/config.m4   Wed Jun 11 09:38:23 2003
   4 @@ -58,7 +58,6 @@
   5  AC_DEFUN(JAVA_CHECK_LIB, [
   6   AC_MSG_CHECKING([Checking for libjava])
   7   if test -d $PHP_JAVA/lib/kaffe; then
   8 -   PHP_ADD_LIBPATH($PHP_JAVA/lib)
   9     JAVA_CFLAGS=-DKAFFE
  10     JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
  11     JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
  12 @@ -111,10 +110,6 @@
  13         JAVA_LIB=java
  14         JAVA_LIBPATH=$i
  15
  16 -       test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
  17 -       test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
  18 -       test -d $i/server  && PHP_ADD_LIBPATH($i/server)
  19 -       test -d $i/native_threads && PHP_ADD_LIBPATH($i/native_threads)
  20       fi
  21     done
  22
  23 @@ -160,19 +155,12 @@
  24        AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
  25      fi
  26
  27 -    PHP_ADD_LIBPATH($JAVA_LIBPATH)
  28      JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
  29    fi
  30
  31    if test "$PHP_SAPI" != "servlet"; then
  32      PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE)
  33
  34 -    if test "$PHP_SAPI" = "cgi"; then
  35 -      if test "$platform" != "Darwin"; then
  36 -        PHP_ADD_LIBRARY($JAVA_LIB)
  37 -      fi
  38 -    fi
  39 -
  40      if test -n "$INSTALL_IT"; then
  41        INSTALL_IT="$INSTALL_IT ;"
  42      fi