cvs: php4(PHP_4_3) /ext/java config.m4
| From: | Christian Stocker | Date: | Fri, 29 Nov 2002 13:32:50 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/java config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-16747@lists.php.net to get a copy of this message | ||
chregu Fri Nov 29 08:32:50 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/java config.m4
Log:
MFH
fix for bug #20389 (no trailing slash in configure option)
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.46 php4/ext/java/config.m4:1.46.4.1
--- php4/ext/java/config.m4:1.46 Tue Aug 20 21:41:21 2002
+++ php4/ext/java/config.m4 Fri Nov 29 08:32:49 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.46 2002/08/21 01:41:21 kalowsky Exp $
+dnl $Id: config.m4,v 1.46.4.1 2002/11/29 13:32:49 chregu Exp $
dnl
AC_DEFUN(JAVA_FIND_JAR, [
AC_MSG_CHECKING([Java Jar location])
@@ -101,7 +101,7 @@
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
done
- for i in
find $PHP_JAVA -type d; do
+ for i in find $PHP_JAVA/ -type d; do
test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
test -f $i/rt.jar && JAVA_CFLAGS=-DJNI_12
test -f $i/classes.zip && JAVA_CLASSPATH=$i/classes.zip