From: Sam Ruby <rubys@php.net>
Date: Sat, 1 Apr 2000 16:21:55 +0000 (+0000)
Subject: Don't try to install php_java.jar if --with-servlet was specified
X-Git-Tag: php-4.0RC2~531
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47442c4c85c6ffd794b445a3312c5a03f479a654;p=php

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 35d5a4e670..3f323f1e3c 100644
--- 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 35d5a4e670..3f323f1e3c 100644
--- 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