From 6be8fb6a2ea3cfa8a6fbf721ce319260b0392510 Mon Sep 17 00:00:00 2001
From: Dan Kalowsky <kalowsky@php.net>
Date: Wed, 14 Aug 2002 13:48:44 +0000
Subject: Fix a bug for a user provided path as eru.

---
 ext/rpc/java/config.m4 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'ext/rpc/java')

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
@@ -25,6 +25,20 @@ AC_DEFUN(JAVA_FIND_JAR, [
 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,
-- 
cgit v1.2.1