diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2002-08-14 14:36:08 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2002-08-14 14:36:08 +0000 |
| commit | ba07aa06d88b732e46654d149c7977ebedb521d4 (patch) | |
| tree | 04b3e2e31d39466b448189498e0e9ccb2e37b5a3 | |
| parent | 63874f901762030a5b6048930ba70da56161c291 (diff) | |
| download | php-git-ba07aa06d88b732e46654d149c7977ebedb521d4.tar.gz | |
adding in PATH check for JavaJar as well...
| -rw-r--r-- | ext/java/config.m4 | 12 | ||||
| -rw-r--r-- | ext/rpc/java/config.m4 | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ext/java/config.m4 b/ext/java/config.m4 index af691ca3d1..51ee18bf29 100644 --- 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 af691ca3d1..51ee18bf29 100644 --- 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`) ]) |