diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2002-08-14 15:29:48 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2002-08-14 15:29:48 +0000 |
| commit | 49dd85c46077e5b010f59aa730523fad825e2a73 (patch) | |
| tree | 133816e2bc10615aa49e8ba6a6704fb98a8410d5 /ext/rpc/java | |
| parent | 8b1e7744c10ab7d9c63c07ae5c0307e80b076eec (diff) | |
| download | php-git-49dd85c46077e5b010f59aa730523fad825e2a73.tar.gz | |
A little more clean up on the error messages, with a sample JDK 1.3 path to libjava.so
Diffstat (limited to 'ext/rpc/java')
| -rw-r--r-- | ext/rpc/java/config.m4 | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 6f29f40639..3a35b768e8 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -21,7 +21,7 @@ AC_DEFUN(JAVA_FIND_JAR, [ dnl we have a custom path defined so use it dnl if test -d $PHP_JAVA/bin; then - JAVA_JAR=$PHP_JAVA/bin/javac + JAVA_JAR="$PHP_JAVA/bin/javac cf" else AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin]) fi @@ -54,7 +54,7 @@ e.g. --with-java=/java expecting /java/bin/ to contain the binaries]) fi PHP_SUBST(JAVA_C) - AC_MSG_RESULT(`echo $JAVA_C`) + AC_MSG_RESULT([$JAVA_C]) ]) AC_DEFUN(JAVA_CHECK_LIB, [ @@ -90,6 +90,10 @@ AC_DEFUN(JAVA_CHECK_LIB, [ for i in $PHP_JAVA/include/*; do test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i" done +dnl +dnl sample JDK v 1.3 path +dnl /usr/java/j2sdk1.4.0_01/jre/lib/i386/libjava.so +dnl else dnl dnl We have to find everything @@ -138,7 +142,6 @@ if test "$PHP_JAVA" != "no"; then HP-UX) java_libext=libjava.sl ;; Darwin) java_libext=libjava.jnilib ;; esac - JAVA_FIND_JAR() JAVA_FIND_C() @@ -149,19 +152,6 @@ if test "$PHP_JAVA" != "no"; then PHP_CHECK_FRAMEWORK("JavaVM", JNI_CreateJavaVM,[AC_DEFINE(HAVE_JAVA,1,[ ])]) PHP_ADD_FRAMEWORK("JavaVM") else - dnl - dnl it can't be no, and now we test to make sure it can't be yes - dnl if it isn't 'yes' well, we just have to build a path using which - dnl if it is 'yes' we have a path provided to us, now run free! - dnl - if test "$PHP_JAVA" = "yes"; then - dnl - dnl Give us the basepath for where javac is! - dnl - PHP_JAVA=`cd \`dirname \\\`which javac\\\`\`/..;pwd` - else - test -x $PHP_JAVA/bin/jar && JAVA_JAR="$PHP_JAVA/bin/jar cf" - fi JAVA_CHECK_LIB() AC_DEFINE(HAVE_JAVA,1,[ ]) |