cvs: /php4/ext/java config.m4

rubys Fri Jan 28 02:53:35 2000 EDT Modified files: /php4/ext/java config.m4 Log: accomodate old versions of kaffe which don't support jar Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.10 php4/ext/java/config.m4:1.11 --- php4/ext/java/config.m4:1.10 Wed Jan 26 18:13:20 2000 +++ php4/ext/java/config.m4 Fri Jan 28 02:53:05 2000 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.10 2000/01/27 02:13:20 rubys Exp $ +# $Id: config.m4,v 1.11 2000/01/28 10:53:05 rubys Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -10,6 +10,13 @@ if test "$withval" != "no"; then JAVA_SHARED="libphp_java.la" + # substitute zip for systems which don't have jar in the PATH + if JAVA_JAR=which jar 2>/dev/null; then + JAVA_JAR="$JAVA_JAR cf" + else + JAVA_JAR='zip -q0' + fi + if test "$withval" = "yes"; then if test -d /usr/local/lib/kaffe; then JAVA_CFLAGS="-DKAFFE" @@ -23,6 +30,12 @@ AC_MSG_RESULT(no) AC_MSG_ERROR(unable to find Java VM libraries) fi + + # accomodate old versions of kaffe which don't support jar + if kaffe -version 2>&1 | grep 1.0b > /dev/null; then + JAVA_JAR='zip -q0' + fi + else if test -f $withval/lib/libjava.so; then JAVA_INCLUDE="-I$withval/include" @@ -47,13 +60,6 @@ AC_MSG_ERROR(unable to find Java VM libraries) fi fi - fi - - # substitute zip for systems which don't have jar in the PATH - if JAVA_JAR=which jar 2>/dev/null; then - JAVA_JAR="$JAVA_JAR cf" - else - JAVA_JAR='zip -q0' fi AC_DEFINE(HAVE_JAVA,1,[ ])