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

diff --git a/configure.in b/configure.in
index 0cd1b27cb03e78bbd5deb8b462667851f38aeaa9..e9c308962b4f024d712d8d24aa33f33c621739a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -618,7 +618,6 @@ enable_static=yes
 case "$php_build_target" in
 program)
     enable_shared=no
-    PHP_PROGRAM=php
 ;;
 shared)
     enable_static=no
@@ -629,6 +628,10 @@ static)
 ;;
 esac
 
+if test "$PHP_SAPI" = "cgi"; then
+  PHP_PROGRAM=php
+fi
+
 PHP_REGEX
 
 case "`uname -s`" in

diff --git a/ext/java/Makefile.in b/ext/java/Makefile.in
index 9f8488e1b1c0858fb9ed12632ef411e70d42f2c3..f0fa6c4032ab7c1f7197813c726ed2ddc89b7737 100644 (file)
--- a/ext/java/Makefile.in
+++ b/ext/java/Makefile.in
@@ -4,16 +4,15 @@ topsrcdir = @topsrcdir@
 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 @@ php_java.jar : reflect.java
        @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

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index f0fdd8029793a4221b7729b95a34370059fa8b98..3c1295ab9c751a8f48f0f4e11b0b7e04ded84c04 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -49,6 +49,13 @@ AC_ARG_WITH(java,
       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_CFLAGS)
 PHP_SUBST(JAVA_CLASSPATH)
 PHP_SUBST(JAVA_INCLUDE)
 PHP_SUBST(JAVA_SHARED)
-PHP_SUBST(JAVA_LFLAGS)
+PHP_SUBST(JAVA_JAR)
 

diff --git a/ext/rpc/Makefile.in b/ext/rpc/Makefile.in
index 9f8488e1b1c0858fb9ed12632ef411e70d42f2c3..f0fa6c4032ab7c1f7197813c726ed2ddc89b7737 100644 (file)
--- a/ext/rpc/Makefile.in
+++ b/ext/rpc/Makefile.in
@@ -4,16 +4,15 @@ topsrcdir = @topsrcdir@
 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 @@ php_java.jar : reflect.java
        @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

diff --git a/ext/rpc/java/Makefile.in b/ext/rpc/java/Makefile.in
index 9f8488e1b1c0858fb9ed12632ef411e70d42f2c3..f0fa6c4032ab7c1f7197813c726ed2ddc89b7737 100644 (file)
--- a/ext/rpc/java/Makefile.in
+++ b/ext/rpc/java/Makefile.in
@@ -4,16 +4,15 @@ topsrcdir = @topsrcdir@
 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 @@ php_java.jar : reflect.java
        @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

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index f0fdd8029793a4221b7729b95a34370059fa8b98..3c1295ab9c751a8f48f0f4e11b0b7e04ded84c04 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -49,6 +49,13 @@ AC_ARG_WITH(java,
       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_CFLAGS)
 PHP_SUBST(JAVA_CLASSPATH)
 PHP_SUBST(JAVA_INCLUDE)
 PHP_SUBST(JAVA_SHARED)
-PHP_SUBST(JAVA_LFLAGS)
+PHP_SUBST(JAVA_JAR)
 

diff --git a/sapi/servlet/Makefile.in b/sapi/servlet/Makefile.in
index 4ae422d98fee282d0aed7c5c4c6ec0f15555406b..bcc063bfe35b2ff79130c1cd5601b553383e4652 100644 (file)
--- a/sapi/servlet/Makefile.in
+++ b/sapi/servlet/Makefile.in
@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 
 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 @@ include $(topsrcdir)/build/ltlib.mk
 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