From: Dan Kalowsky <kalowsky@php.net>
Date: Wed, 14 Aug 2002 17:04:05 +0000 (+0000)
Subject: Adding a check for the binaries rather than just the directories.
X-Git-Tag: php-4.3.0dev_zend2_alpha3~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b691d154ab1e3ead10ad15133baa10886d59cf7;p=php

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

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index f7ce9953e6..f23c82b3bb 100644
--- 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 f7ce9953e6..f23c82b3bb 100644
--- 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])