Fix a bug for a user provided path as eru.

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 925ae40f642b1224129a76ee9d1f912322a006c9..af691ca3d11189e33363ab4d34e5c8183812b64d 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/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,

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 925ae40f642b1224129a76ee9d1f912322a006c9..af691ca3d11189e33363ab4d34e5c8183812b64d 100644 (file)
--- 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,