diff options
| author | Sascha Schumann <sas@php.net> | 2001-09-10 16:59:31 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-09-10 16:59:31 +0000 |
| commit | 2ee197b4c6b2548a29e0bd9a6a0770f2c54a8fc2 (patch) | |
| tree | 45f86054b2a916db4334d242b754b1f273597b85 /ext/rpc/java | |
| parent | 87d7284e461637d087737b7809dc6e222505190f (diff) | |
| download | php-git-2ee197b4c6b2548a29e0bd9a6a0770f2c54a8fc2.tar.gz | |
Fix a problem when withval pointed to a symlink and automatic
detection for the java libraries failed
Diffstat (limited to 'ext/rpc/java')
| -rw-r--r-- | ext/rpc/java/config.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 34aa68a27f..40b9a6f827 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -54,7 +54,7 @@ AC_ARG_WITH(java, test -f $withval/lib/classes.zip && JAVA_CLASSPATH=$withval/lib/classes.zip test -f $withval/lib/jvm.jar && JAVA_CLASSPATH=$withval/lib/jvm.jar for i in $JAVA_INCLUDE/*; do - test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i" + test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i" done else @@ -64,7 +64,7 @@ AC_ARG_WITH(java, test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" done - for i in `find $withval -type d`; do + for i in `find $withval/. -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 @@ -89,6 +89,9 @@ AC_ARG_WITH(java, fi AC_DEFINE(HAVE_JAVA,1,[ ]) + if test -z "$JAVA_LIBPATH"; then + AC_MSG_ERROR(unable to find Java VM libraries) + fi PHP_ADD_LIBPATH($JAVA_LIBPATH) JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'" |