From: Sebastian Bergmann <sebastian@php.net>
Date: Sun, 12 Jan 2003 08:01:42 +0000 (+0000)
Subject: Patch by Giuseppe Tanzilli <g.tanzilli@gruppocsf.com>.
X-Git-Tag: PHP_5_0_dev_before_13561_fix~305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a142ce729f9ac9a62d8de32ae2acd580b05ae85d;p=php

Patch by Giuseppe Tanzilli <g.tanzilli@gruppocsf.com>.
---

diff --git a/sapi/servlet/Makefile.frag b/sapi/servlet/Makefile.frag
index 6570d92bde..3ad40f86ac 100644
--- a/sapi/servlet/Makefile.frag
+++ b/sapi/servlet/Makefile.frag
@@ -1,19 +1,19 @@
 
-$(builddir)/java.c : $(srcdir)/../../ext/java/java.c
-	@cp $(srcdir)/../../ext/java/java.c $(builddir)
+sapi/servlet/java.c : sapi/servlet/../../ext/java/java.c sapi/servlet/phpsrvlt.jar
+	@cp sapi/servlet/../../ext/java/java.c sapi/servlet
 
-$(builddir)/phpsrvlt.jar : $(srcdir)/servlet.java $(srcdir)/../../ext/java/reflect.java
-	$(mkinstalldirs) $(builddir)/net/php
-	@echo library=php4 > $(builddir)/net/php/reflect.properties
-	@echo library=php4 > $(builddir)/net/php/servlet.properties
-	@cp $(builddir)/formatter.java $(builddir)/net/php
-	@cp $(builddir)/servlet.java $(builddir)/net/php
-	@cp $(srcdir)/../../ext/java/reflect.java $(builddir)/net/php
-	cd $(builddir) && javac net/php/reflect.java
-	@test ! -f $(builddir)/reflect.class || mv $(builddir)/reflect.class $(builddir)/net/php # bug in KJC javac
-	javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/servlet.java
-	@test ! -f $(builddir)/servlet.class || mv $(builddir)/servlet.class $(builddir)/net/php # bug in KJC javac
-	javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/formatter.java
-	@test ! -f $(builddir)/formatter.class || mv $(builddir)/formatter.class $(builddir)/net/php # bug in KJC javac
-	cd $(builddir)/ && $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
-	@rm -rf $(builddir)/net
+sapi/servlet/phpsrvlt.jar : sapi/servlet/servlet.java sapi/servlet/../../ext/java/reflect.java
+	$(mkinstalldirs) sapi/servlet/net/php
+	@echo library=php4 > sapi/servlet/net/php/reflect.properties
+	@echo library=php4 > sapi/servlet/net/php/servlet.properties
+	@cp sapi/servlet/formatter.java sapi/servlet/net/php
+	@cp sapi/servlet/servlet.java sapi/servlet/net/php
+	@cp sapi/servlet/../../ext/java/reflect.java sapi/servlet/net/php
+	cd sapi/servlet && javac net/php/reflect.java
+	@test ! -f sapi/servlet/reflect.class || mv sapi/servlet/reflect.class sapi/servlet/net/php # bug in KJC javac
+	cd sapi/servlet && javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH):. net/php/servlet.java
+	@test ! -f sapi/servlet/servlet.class || mv sapi/servlet/servlet.class sapi/servlet/net/php # bug in KJC javac
+	cd sapi/servlet && javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH):. net/php/formatter.java
+	@test ! -f sapi/servlet/formatter.class || mv sapi/servlet/formatter.class sapi/servlet/net/php # bug in KJC javac
+	cd sapi/servlet/ && $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
+	@rm -rf sapi/servlet/net
diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 46219bee00..05ebd70fad 100644
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -34,13 +34,15 @@ AC_ARG_WITH(servlet,
     AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])
 
     INSTALL_IT="\$(mkinstalldirs) \$(libdir)"
-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(top_srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
     INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)"
     PHP_SAPI=servlet
     PHP_BUILD_THREAD_SAFE
+    EXTRA_INCLUDES="$EXTRA_INCLUDES \$(JAVA_INCLUDE)"
     PHP_SELECT_SAPI(servlet, shared, servlet.c)
-    PHP_ADD_SOURCES(/sapi/servlet, java.c,,sapi)
+    PHP_ADD_SOURCES(/sapi/servlet, java.c,, sapi)
     PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag)
+
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index eda9e88ab5..1a0282017e 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -258,7 +258,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_startup
 
 	sapi_startup(&servlet_sapi_module);
 
-	if (php_module_startup(&servlet_sapi_module, additional_php_extensions, EXTCOUNT)==FAILURE) {
+	if (php_module_startup(&servlet_sapi_module, &java_module_entry, 1)==FAILURE) {
 		ThrowServletException(jenv,"module startup failure");
 		return;
 	}