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

rubys Wed Jan 19 06:45:55 2000 EDT Modified files: /php4 configure.in /php4/ext/java Makefile.in config.m4 /php4/sapi/servlet Makefile.in Log: First step to restoring the ability to build Java support on Unix: 1) Restore the ability to build CGI as a shared library 2) Correct make dependency rule so that the jar files are included 3) Search for jar executable, and use it, if found Left TODO: actually build the shared libraries Index: php4/configure.in diff -u php4/configure.in:1.86 php4/configure.in:1.87 --- php4/configure.in:1.86 Wed Jan 12 11:56:12 2000 +++ php4/configure.in Wed Jan 19 06:45:24 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.86 2000/01/12 19:56:12 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.87 2000/01/19 14:45:24 rubys Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -618,7 +618,6 @@ case "$php_build_target" in program) enable_shared=no - PHP_PROGRAM=php ;; shared) enable_static=no @@ -628,6 +627,10 @@ enable_shared=no ;; esac + +if test "$PHP_SAPI" = "cgi"; then + PHP_PROGRAM=php +fi PHP_REGEX Index: php4/ext/java/Makefile.in diff -u php4/ext/java/Makefile.in:1.1 php4/ext/java/Makefile.in:1.2 --- php4/ext/java/Makefile.in:1.1 Wed Dec 29 18:59:00 1999 +++ php4/ext/java/Makefile.in Wed Jan 19 06:45:24 2000 @@ -4,16 +4,15 @@ srcdir = @srcdir@ VPATH = @srcdir@ -LTLIBRARY_NAME = libjava.la +LTLIBRARY_NAME = libphp_java.la LTLIBRARY_SOURCES = java.c -LTLIBRARY_LIBADD = $(JAVA_LFLAGS) +LTLIBRARY_DEPENDENCIES = php_java.jar EXTRA_CFLAGS = $(JAVA_CFLAGS) EXTRA_INCLUDES = $(JAVA_INCLUDE) include $(topsrcdir)/build/ltlib.mk -phplib_DATA=php_java.jar php_java.jar : reflect.java @test -e net || mkdir net @test -e net/php || mkdir net/php @@ -21,7 +20,7 @@ @echo library=php4>net/php/reflect.properties javac net/php/reflect.java @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac - zip -q0 php_java.jar net/php/*.class net/php/*.properties + $(JAVA_JAR) php_java.jar net/php/*.class net/php/*.properties @rm net/php/reflect.* @rmdir net/php @rmdir net Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.8 php4/ext/java/config.m4:1.9 --- php4/ext/java/config.m4:1.8 Wed Dec 29 20:52:04 1999 +++ php4/ext/java/config.m4 Wed Jan 19 06:45:24 2000 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.8 1999/12/30 04:52:04 sas Exp $ +# $Id: config.m4,v 1.9 2000/01/19 14:45:24 rubys Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -49,6 +49,13 @@ fi fi + # 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 + AC_DEFINE(HAVE_JAVA,1,[ ]) PHP_EXTENSION(java, shared) PHP_BUILD_SHARED @@ -64,5 +71,5 @@ PHP_SUBST(JAVA_CLASSPATH) PHP_SUBST(JAVA_INCLUDE) PHP_SUBST(JAVA_SHARED) -PHP_SUBST(JAVA_LFLAGS) +PHP_SUBST(JAVA_JAR) Index: php4/sapi/servlet/Makefile.in diff -u php4/sapi/servlet/Makefile.in:1.3 php4/sapi/servlet/Makefile.in:1.4 --- php4/sapi/servlet/Makefile.in:1.3 Mon Jan 3 19:01:42 2000 +++ php4/sapi/servlet/Makefile.in Wed Jan 19 06:45:24 2000 @@ -6,6 +6,7 @@ LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = servlet.c java.c +LTLIBRARY_DEPENDENCIES = phpsrvlt.jar EXTRA_CFLAGS = $(JAVA_CFLAGS) EXTRA_INCLUDES = $(JAVA_INCLUDE) @@ -15,7 +16,6 @@ java.c : ../../ext/java/java.c @cp ../../ext/java/java.c . -phplib_DATA=phpsrvlt.jar phpsrvlt.jar : servlet.java ../../ext/java/reflect.java @test -e net || mkdir net @test -e net/php || mkdir net/php