adding in PATH check for JavaJar as well...

24 years ago · ba07aa06d8
2 changed files with 20 additions and 4 deletions
--- 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`)
 ])

--- 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`)
 ])