Don't try to install php_java.jar if --with-servlet was specified

(Fix to PHP 4.0 Bug #4001 submitted by sashi@easy.com.au)

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 35d5a4e670e22c324f18db9c3f961e205675b4d5..3f323f1e3c8946df4afd7607709dc0112355aaf6 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -88,9 +88,9 @@ AC_ARG_WITH(java,
       if test "$PHP_SAPI" = "cgi"; then
         AC_ADD_LIBRARY($JAVA_LIB)
       fi
-    fi
 
-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)"
+      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)"
+    fi
 
     AC_MSG_RESULT(yes)
   else

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 35d5a4e670e22c324f18db9c3f961e205675b4d5..3f323f1e3c8946df4afd7607709dc0112355aaf6 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -88,9 +88,9 @@ AC_ARG_WITH(java,
       if test "$PHP_SAPI" = "cgi"; then
         AC_ADD_LIBRARY($JAVA_LIB)
       fi
-    fi
 
-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)"
+      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)"
+    fi
 
     AC_MSG_RESULT(yes)
   else