Adding a check for the binaries rather than just the directories.

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index f7ce9953e69a09f54b2fe8011784237515909143..f23c82b3bba066235029165beb767b3a1c1c253e 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -20,7 +20,7 @@ AC_DEFUN(JAVA_FIND_JAR, [
   dnl
   dnl we have a custom path defined so use it
   dnl
-    if test -d $PHP_JAVA/bin; then
+    if test -x $PHP_JAVA/bin/jar; then
       JAVA_JAR="$PHP_JAVA/bin/jar cf"
     else
       AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
@@ -40,7 +40,7 @@ AC_DEFUN(JAVA_FIND_C, [
   dnl directory.  
   dnl
     if test -z "$PHP_JAVA" != "yes"; then
-     if test -z $PHP_JAVA/bin; then
+     if test -x $PHP_JAVA/bin/javac; then
       JAVA_C=$PHP_JAVA/bin/javac
      else
       AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index f7ce9953e69a09f54b2fe8011784237515909143..f23c82b3bba066235029165beb767b3a1c1c253e 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -20,7 +20,7 @@ AC_DEFUN(JAVA_FIND_JAR, [
   dnl
   dnl we have a custom path defined so use it
   dnl
-    if test -d $PHP_JAVA/bin; then
+    if test -x $PHP_JAVA/bin/jar; then
       JAVA_JAR="$PHP_JAVA/bin/jar cf"
     else
       AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
@@ -40,7 +40,7 @@ AC_DEFUN(JAVA_FIND_C, [
   dnl directory.  
   dnl
     if test -z "$PHP_JAVA" != "yes"; then
-     if test -z $PHP_JAVA/bin; then
+     if test -x $PHP_JAVA/bin/javac; then
       JAVA_C=$PHP_JAVA/bin/javac
      else
       AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])