cvs: php4 /ext/java config.m4

sas Mon Sep 10 12:59:31 2001 EDT Modified files: /php4/ext/java config.m4 Log: Fix a problem when withval pointed to a symlink and automatic detection for the java libraries failed Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.25 php4/ext/java/config.m4:1.26 --- php4/ext/java/config.m4:1.25 Sat May 12 07:08:51 2001 +++ php4/ext/java/config.m4 Mon Sep 10 12:59:30 2001 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.25 2001/05/12 11:08:51 sas Exp $ +# $Id: config.m4,v 1.26 2001/09/10 16:59:30 sas Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -54,7 +54,7 @@ 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 @@ 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 @@ 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\"'"