Progress: sapi/servlet now builds again on Unix

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 7f1164cd12085d3bd1182ac1e436ee20b2801630..933e2865577889869ee5d951ea19179dbd55f541 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -63,7 +63,9 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA,1,[ ])
-    PHP_EXTENSION(java, shared)
+    if test "$PHP_SAPI" != "servlet"; then
+      PHP_EXTENSION(java, shared)
+    fi
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 7f1164cd12085d3bd1182ac1e436ee20b2801630..933e2865577889869ee5d951ea19179dbd55f541 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -63,7 +63,9 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA,1,[ ])
-    PHP_EXTENSION(java, shared)
+    if test "$PHP_SAPI" != "servlet"; then
+      PHP_EXTENSION(java, shared)
+    fi
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)

diff --git a/sapi/servlet/Makefile.in b/sapi/servlet/Makefile.in
index 3bd1fc4724e977b202417431319655ebc7fd5560..51796a239632865c5ae9568c1f6b558c365d1cbf 100644 (file)
--- a/sapi/servlet/Makefile.in
+++ b/sapi/servlet/Makefile.in
@@ -4,7 +4,7 @@ topsrcdir = @topsrcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-LTLIBRARY_SHARED_NAME = libphpsrvlt.la
+LTLIBRARY_NAME = libsapi.la
 LTLIBRARY_SOURCES = servlet.c java.c
 LTLIBRARY_DEPENDENCIES = phpsrvlt.jar
 
@@ -19,13 +19,13 @@ java.c : ../../ext/java/java.c
 phpsrvlt.jar : servlet.java ../../ext/java/reflect.java
        @test -e net || mkdir net
        @test -e net/php || mkdir net/php
-       @echo library=phpsrvlt>net/php/reflect.properties
-       @echo library=phpsrvlt>net/php/servlet.properties
+       @echo library=sapi>net/php/reflect.properties
+       @echo library=sapi>net/php/servlet.properties
        @cp servlet.java net/php
        @cp ../../ext/java/reflect.java net/php
        javac net/php/reflect.java
        @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
-       javac -classpath .:@SERVLET_CLASSPATH@:@JAVA_CLASSPATH@ net/php/servlet.java
+       javac -classpath .:$(SERVLET_CLASSPATH):$(JAVA_CLASSPATH) net/php/servlet.java
        @test ! -f servlet.class || mv servlet.class net/php # bug in KJC javac
        $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
        @rm net/php/servlet.* net/php/reflect.*