MFH (use of correct javac/jar binaries)

5 files changed, 39 insertions, 13 deletions

diff --git a/ext/java/Makefile.in b/ext/java/Makefile.in
index 2a980157d2..f968ba7b3e 100644
--- a/ext/java/Makefile.in
+++ b/ext/java/Makefile.in
@@ -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.*
diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 9fe8e75437..d881a552ce 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -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)
diff --git a/ext/rpc/Makefile.in b/ext/rpc/Makefile.in
index 2a980157d2..f968ba7b3e 100644
--- a/ext/rpc/Makefile.in
+++ b/ext/rpc/Makefile.in
@@ -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.*
diff --git a/ext/rpc/java/Makefile.in b/ext/rpc/java/Makefile.in
index 2a980157d2..f968ba7b3e 100644
--- a/ext/rpc/java/Makefile.in
+++ b/ext/rpc/java/Makefile.in
@@ -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.*
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 9fe8e75437..d881a552ce 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -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)