cvs: php4 /ext/java config.m4
| From: | Dan Kalowsky | Date: | Wed, 14 Aug 2002 14:36:08 +0000 |
| Subject: | cvs: php4 /ext/java config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13348@lists.php.net to get a copy of this message | ||
kalowsky Wed Aug 14 10:36:08 2002 EDT
Modified files:
/php4/ext/java config.m4
Log:
adding in PATH check for JavaJar as well...
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.34 php4/ext/java/config.m4:1.35
--- php4/ext/java/config.m4:1.34 Wed Aug 14 09:48:43 2002
+++ php4/ext/java/config.m4 Wed Aug 14 10:36:07 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.34 2002/08/14 13:48:43 kalowsky Exp $
+dnl $Id: config.m4,v 1.35 2002/08/14 14:36:07 kalowsky Exp $
dnl
AC_DEFUN(JAVA_FIND_JAR, [
AC_MSG_CHECKING([Java Jar location])
@@ -16,9 +16,17 @@
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)
])