adding in PATH check for JavaJar as well...

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index af691ca3d11189e33363ab4d34e5c8183812b64d..51ee18bf2911687835b662578fcf7cc4af0358b6 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -16,9 +16,17 @@ AC_DEFUN(JAVA_FIND_JAR, [
     if test -z "$JAVA_JAR"; then
       JAVA_JAR='zip -q0'
     fi
-
-    PHP_SUBST(JAVA_JAR)
+  else
+  dnl
+  dnl we have a custom path defined so use it
+  dnl
+    if test -d $PHP_JAVA/bin; then
+      JAVA_JAR=$PHP_JAVA/bin/javac
+    else
+      AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
+    fi
   fi
+  PHP_SUBST(JAVA_JAR)
   AC_MSG_RESULT(`echo $JAVA_JAR`)
 ])
 

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index af691ca3d11189e33363ab4d34e5c8183812b64d..51ee18bf2911687835b662578fcf7cc4af0358b6 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -16,9 +16,17 @@ AC_DEFUN(JAVA_FIND_JAR, [
     if test -z "$JAVA_JAR"; then
       JAVA_JAR='zip -q0'
     fi
-
-    PHP_SUBST(JAVA_JAR)
+  else
+  dnl
+  dnl we have a custom path defined so use it
+  dnl
+    if test -d $PHP_JAVA/bin; then
+      JAVA_JAR=$PHP_JAVA/bin/javac
+    else
+      AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
+    fi
   fi
+  PHP_SUBST(JAVA_JAR)
   AC_MSG_RESULT(`echo $JAVA_JAR`)
 ])