Changeset 4149

Timestamp:

09/30/03 17:16:39 (20 years ago)

Author:

piso

Message:

OS X support.

Location:

trunk/j

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (6 diffs)

trunk/j/configure

@@ -1354 +1354 @@
 elif test -x $JDK/jre/bin/java; then
     JAVA=$JDK/jre/bin/java;
+elif test -x $JDK/Home/bin/java; then
+    JAVA=$JDK/Home/bin/java;
 else
     { { echo "$as_me:$LINENO: error: Java not found" >&5
@@ -1436 +1438 @@
 done
 
+test -z "$JAVAC" && test -x $JDK/Home/bin/javac && JAVAC=$JDK/Home/bin/javac
 test -z "$JAVAC" && JAVAC=$JDK/bin/javac
 if test "$JAVAC" = jikes; then
@@ -1484 +1487 @@
 done
 
+test -z "$JAR" && test -x $JDK/Home/bin/jar && JAR=$JDK/Home/bin/jar
 test -z "$JAR" && JAR=$JDK/bin/jar
 
@@ -1493 +1497 @@
     JAVA_RUNTIME=""
     for i in $JDK/jre/lib/*.jar ; do JAVA_RUNTIME=$JAVA_RUNTIME:$i ; done
+elif test -d $JDK/Classes ; then
+    JAVA_RUNTIME=""
+    for i in $JDK/Classes/*.jar ; do JAVA_RUNTIME=$JAVA_RUNTIME:$i ; done
 else
     { { echo "$as_me:$LINENO: error: unable to find Java runtime" >&5

trunk/j/configure.in

@@ -2 +2 @@
 dnl
 dnl  Copyright (C) 1998-2003 Peter Graves
-dnl  $Id: configure.in,v 1.152 2003-09-16 23:59:12 piso Exp $
+dnl  $Id: configure.in,v 1.153 2003-09-30 17:15:37 piso Exp $
 dnl
 dnl  This program is free software; you can redistribute it and/or
@@ -18 +18 @@
 dnl  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.152 $)
+AC_REVISION($Revision: 1.153 $)
 
 BOOTFILE=./configure-options
@@ -80 +80 @@
 elif test -x $JDK/jre/bin/java; then
     JAVA=$JDK/jre/bin/java;
+elif test -x $JDK/Home/bin/java; then
+    JAVA=$JDK/Home/bin/java;
 else
     AC_MSG_ERROR(Java not found)
@@ -113 +115 @@
 
 test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, jikes)
+test -z "$JAVAC" && test -x $JDK/Home/bin/javac && JAVAC=$JDK/Home/bin/javac
 test -z "$JAVAC" && JAVAC=$JDK/bin/javac
 if test "$JAVAC" = jikes; then
@@ -123 +126 @@
 
 test -z "$JAR" && AC_CHECK_PROGS(JAR, fastjar)
+test -z "$JAR" && test -x $JDK/Home/bin/jar && JAR=$JDK/Home/bin/jar
 test -z "$JAR" && JAR=$JDK/bin/jar
 AC_SUBST(JAR)
@@ -133 +137 @@
     JAVA_RUNTIME=""
     for i in $JDK/jre/lib/*.jar ; do JAVA_RUNTIME=$JAVA_RUNTIME:$i ; done
+elif test -d $JDK/Classes ; then
+    JAVA_RUNTIME=""
+    for i in $JDK/Classes/*.jar ; do JAVA_RUNTIME=$JAVA_RUNTIME:$i ; done
 else
     AC_MSG_ERROR(unable to find Java runtime)