php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

MFH (use of correct javac/jar binaries)

Browse Source
This commit is contained in:
foobar
2002-04-14 00:40:59 +00:00
parent 9f3f7701f8
commit 2a6153f007
5 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/java/Makefile.in
+1 -1
View File
@@ -17,7 +17,7 @@ php_java.jar : reflect.java
$(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.*
ext/java/config.m4
+18 -5
View File
@@ -16,15 +16,27 @@ AC_ARG_WITH(java,
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_CLASSPATH)
PHP_SUBST(JAVA_INCLUDE)
PHP_SUBST(JAVA_SHARED)
PHP_SUBST(JAVA_JAR)
PHP_SUBST(JAVA_C)
ext/rpc/Makefile.in
+1 -1
View File
@@ -17,7 +17,7 @@ php_java.jar : reflect.java
$(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.*
ext/rpc/java/Makefile.in
+1 -1
View File
@@ -17,7 +17,7 @@ php_java.jar : reflect.java
$(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.*
ext/rpc/java/config.m4
+18 -5
View File
@@ -16,15 +16,27 @@ AC_ARG_WITH(java,
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_CLASSPATH)
PHP_SUBST(JAVA_INCLUDE)
PHP_SUBST(JAVA_SHARED)
PHP_SUBST(JAVA_JAR)
PHP_SUBST(JAVA_C)