cvs: php4 /ext/java config.m4
| From: | Dan Kalowsky | Date: | Wed, 14 Aug 2002 15:29:47 +0000 |
| Subject: | cvs: php4 /ext/java config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13350@lists.php.net to get a copy of this message | ||
kalowsky Wed Aug 14 11:29:47 2002 EDT
Modified files:
/php4/ext/java config.m4
Log:
A little more clean up on the error messages, with a sample JDK 1.3 path to libjava.so
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.36 php4/ext/java/config.m4:1.37
--- php4/ext/java/config.m4:1.36 Wed Aug 14 10:37:03 2002
+++ php4/ext/java/config.m4 Wed Aug 14 11:29:47 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.36 2002/08/14 14:37:03 kalowsky Exp $
+dnl $Id: config.m4,v 1.37 2002/08/14 15:29:47 kalowsky Exp $
dnl
AC_DEFUN(JAVA_FIND_JAR, [
AC_MSG_CHECKING([Java Jar location])
@@ -21,7 +21,7 @@
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 @@
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 @@
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 @@
HP-UX) java_libext=libjava.sl ;;
Darwin) java_libext=libjava.jnilib ;;
esac
-
JAVA_FIND_JAR()
JAVA_FIND_C()
@@ -149,19 +152,6 @@
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,[ ])