cvs: php4(PHP_4_2_0) /ext/java Makefile.in config.m4

sniper Sat Apr 13 20:40:57 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/java Makefile.in config.m4 Log: MFH (use of correct javac/jar binaries) Index: php4/ext/java/Makefile.in diff -u php4/ext/java/Makefile.in:1.13 php4/ext/java/Makefile.in:1.13.10.1 --- php4/ext/java/Makefile.in:1.13 Mon May 15 12:02:42 2000 +++ php4/ext/java/Makefile.in Sat Apr 13 20:40:57 2002 @@ -17,7 +17,7 @@ $(mkinstalldirs) net/php @cp $(srcdir)/reflect.java net/php @echo library=php_java>net/php/reflect.properties - javac net/php/reflect.java + $(JAVA_C) net/php/reflect.java @test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac $(JAVA_JAR) php_java.jar net/php/*.class net/php/*.properties @rm net/php/reflect.* Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.28 php4/ext/java/config.m4:1.28.2.1 --- php4/ext/java/config.m4:1.28 Fri Nov 30 13:59:41 2001 +++ php4/ext/java/config.m4 Sat Apr 13 20:40:57 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28 2001/11/30 18:59:41 sniper Exp $ +dnl $Id: config.m4,v 1.28.2.1 2002/04/14 00:40:57 sniper Exp $ dnl AC_MSG_CHECKING(for Java support) @@ -16,15 +16,27 @@ AIX) java_libext=libjava.a ;; HP-UX) java_libext=libjava.sl ;; esac - # 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" + + if test "$withval" = "yes"; then + if JAVA_JAR=which jar 2>/dev/null; then + JAVA_JAR="$JAVA_JAR cf" + else + JAVA_JAR= + fi + withval=cd \dirname \\\which javac\\\\/..;pwd else + test -x $withval/bin/jar && JAVA_JAR="$withval/bin/jar cf" + fi + + # substitute zip for systems which don't have jar + if test -z "$JAVA_JAR"; then JAVA_JAR='zip -q0' fi - if test "$withval" = "yes"; then - withval=cd \dirname \\\which javac\\\\/..;pwd + if test -x $withval/bin/javac; then + JAVA_C=$withval/bin/javac + else + AC_MSG_ERROR([Can not find the javac binary under $withval/bin/]) fi if test -d $withval/lib/kaffe; then @@ -119,3 +131,4 @@ PHP_SUBST(JAVA_INCLUDE) PHP_SUBST(JAVA_SHARED) PHP_SUBST(JAVA_JAR) +PHP_SUBST(JAVA_C)