cvs: /php4/sapi/servlet Makefile.in /php4/ext/java config.m4

rubys Sat Jan 29 09:54:26 2000 EDT Modified files: /php4/sapi/servlet Makefile.in /php4/ext/java config.m4 Log: Progress: sapi/servlet now builds again on Unix Index: php4/sapi/servlet/Makefile.in diff -u php4/sapi/servlet/Makefile.in:1.5 php4/sapi/servlet/Makefile.in:1.6 --- php4/sapi/servlet/Makefile.in:1.5 Sat Jan 29 05:22:46 2000 +++ php4/sapi/servlet/Makefile.in Sat Jan 29 09:53:55 2000 @@ -4,7 +4,7 @@ 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 @@ 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.* Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.11 php4/ext/java/config.m4:1.12 --- php4/ext/java/config.m4:1.11 Fri Jan 28 02:53:05 2000 +++ php4/ext/java/config.m4 Sat Jan 29 09:53:55 2000 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.11 2000/01/28 10:53:05 rubys Exp $ +# $Id: config.m4,v 1.12 2000/01/29 17:53:55 rubys Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -63,7 +63,9 @@ 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)