summaryrefslogtreecommitdiff
path: root/ext/rpc/java
diff options
context:
space:
mode:
authorDan Kalowsky <kalowsky@php.net>2002-08-14 13:48:44 +0000
committerDan Kalowsky <kalowsky@php.net>2002-08-14 13:48:44 +0000
commit6be8fb6a2ea3cfa8a6fbf721ce319260b0392510 (patch)
treea8ba521dc057b995515deffcd06e4d62de1c7e3e /ext/rpc/java
parent780c1605c88cb327f44583a83901a50a493db16e (diff)
downloadphp-git-6be8fb6a2ea3cfa8a6fbf721ce319260b0392510.tar.gz
Fix a bug for a user provided path as eru.
Diffstat (limited to 'ext/rpc/java')
-rw-r--r--ext/rpc/java/config.m414
1 files changed, 14 insertions, 0 deletions
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 925ae40f64..af691ca3d1 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -26,6 +26,20 @@ AC_DEFUN(JAVA_FIND_C, [
AC_MSG_CHECKING([Java C location])
JAVA_C=`which javac`
if test -z "$JAVA_C"; then
+ dnl
+ dnl we will auto assume that the bin directory is underneath
+ dnl the user provided directory, and it includes the javac
+ dnl directory.
+ dnl
+ if test -z "$PHP_JAVA" != "yes"; then
+ if test -z $PHP_JAVA/bin; then
+ JAVA_C=$PHP_JAVA/bin/javac
+ else
+ AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
+ fi
+ fi
+ fi
+ if test -z "$JAVA_C"; then
AC_MSG_ERROR([Unable to locate the javac binary in your system path
Either adjust your Java installation or provide the Java installation path,
e.g. --with-java=/java expecting /java/bin/ to contain the binaries])